138 lines
3.5 KiB
Diff
138 lines
3.5 KiB
Diff
|
--- WINGs/Examples/puzzle.c
|
||
|
+++ WINGs/Examples/puzzle.c
|
||
|
@@ -12,7 +12,7 @@
|
||
|
|
||
|
WMWindow *win;
|
||
|
WMButton *Button[MAX_SIZE];
|
||
|
-char Map[MAX_SIZE];
|
||
|
+signed char Map[MAX_SIZE];
|
||
|
int Size = 4;
|
||
|
int MoveCount;
|
||
|
|
||
|
--- WINGs/WINGs/WUtil.h
|
||
|
+++ WINGs/WINGs/WUtil.h
|
||
|
@@ -216,11 +216,11 @@
|
||
|
/* don't free the returned string */
|
||
|
char* wstrerror(int errnum);
|
||
|
|
||
|
-void wmessage(const char *msg, ...);
|
||
|
-void wwarning(const char *msg, ...);
|
||
|
-void wfatal(const char *msg, ...);
|
||
|
-void wsyserror(const char *msg, ...);
|
||
|
-void wsyserrorwithcode(int error, const char *msg, ...);
|
||
|
+void wmessage(const char *msg, ...) __attribute__((__format__(printf,1,2)));
|
||
|
+void wwarning(const char *msg, ...) __attribute__((__format__(printf,1,2)));
|
||
|
+void wfatal(const char *msg, ...) __attribute__((__format__(printf,1,2)));
|
||
|
+void wsyserror(const char *msg, ...) __attribute__((__format__(printf,1,2)));
|
||
|
+void wsyserrorwithcode(int error, const char *msg, ...) __attribute__((__format__(printf,2,3)));
|
||
|
|
||
|
char* wfindfile(char *paths, char *file);
|
||
|
|
||
|
--- WINGs/dragsource.c
|
||
|
+++ WINGs/dragsource.c
|
||
|
@@ -448,6 +448,7 @@
|
||
|
XDND_TIMESTAMP(info),
|
||
|
XDND_SOURCE_ACTION(info));
|
||
|
}
|
||
|
+ return True;
|
||
|
} else {
|
||
|
/* send position on each move */
|
||
|
return sendDnDClientMessage(info, scr->xdndPositionAtom,
|
||
|
--- WINGs/wcolorpanel.c
|
||
|
+++ WINGs/wcolorpanel.c
|
||
|
@@ -1247,7 +1247,7 @@
|
||
|
}
|
||
|
|
||
|
if (!(dPtr = opendir(panel->configurationPath))) {
|
||
|
- wwarning(_("Color Panel: Could not find file"), "%s", panel->configurationPath);
|
||
|
+ wwarning(_("Color Panel: Could not find file: %s"), panel->configurationPath);
|
||
|
return;
|
||
|
}
|
||
|
|
||
|
@@ -1283,7 +1283,7 @@
|
||
|
WMListItem *item;
|
||
|
|
||
|
if (stat(RGBTXT, &stat_buf) != 0) {
|
||
|
- wsyserror(_("Color Panel: Could not find file"), " %s", RGBTXT);
|
||
|
+ wsyserror(_("Color Panel: Could not find file %s"), RGBTXT);
|
||
|
return;
|
||
|
}
|
||
|
else {
|
||
|
@@ -1301,7 +1301,7 @@
|
||
|
fclose(rgbtxt);
|
||
|
}
|
||
|
else {
|
||
|
- wsyserror(_("Color Panel: Could not find file"), "%s", RGBTXT);
|
||
|
+ wsyserror(_("Color Panel: Could not find file %s"), RGBTXT);
|
||
|
}
|
||
|
}
|
||
|
}
|
||
|
@@ -3746,6 +3746,7 @@
|
||
|
color.red = 0;
|
||
|
color.green = 0;
|
||
|
color.blue = 0;
|
||
|
+ color.alpha = 0;
|
||
|
return color;
|
||
|
}
|
||
|
|
||
|
@@ -3755,6 +3756,7 @@
|
||
|
color.red = xcolor->red >> 8;
|
||
|
color.green = xcolor->green >> 8;
|
||
|
color.blue = xcolor->blue >> 8;
|
||
|
+ color.alpha = 0;
|
||
|
|
||
|
wfree(xcolor);
|
||
|
|
||
|
--- src/cycling.c
|
||
|
+++ src/cycling.c
|
||
|
@@ -22,6 +22,7 @@
|
||
|
|
||
|
#include "wconfig.h"
|
||
|
|
||
|
+#include <stdlib.h>
|
||
|
#include <X11/Xlib.h>
|
||
|
#include <X11/Xutil.h>
|
||
|
#include <X11/keysym.h>
|
||
|
--- src/startup.c
|
||
|
+++ src/startup.c
|
||
|
@@ -25,6 +25,7 @@
|
||
|
#include <stdio.h>
|
||
|
#include <stdlib.h>
|
||
|
#include <unistd.h>
|
||
|
+#include <string.h>
|
||
|
#include <errno.h>
|
||
|
#include <signal.h>
|
||
|
#include <sys/wait.h>
|
||
|
--- src/texture.c
|
||
|
+++ src/texture.c
|
||
|
@@ -421,6 +421,8 @@
|
||
|
texture->argc = argc;
|
||
|
texture->argv = argv;
|
||
|
|
||
|
+ memset(&fallbackColor, 0, sizeof(fallbackColor));
|
||
|
+
|
||
|
fallbackColor.red = 0x8000;
|
||
|
fallbackColor.green = 0x8000;
|
||
|
fallbackColor.blue = 0x8000;
|
||
|
--- src/xdnd.c
|
||
|
+++ src/xdnd.c
|
||
|
@@ -185,7 +185,7 @@
|
||
|
wfree(scr->xdestring); /* this xdestring is not from Xlib (no XFree) */
|
||
|
}
|
||
|
|
||
|
- /* why doesn't this function return anything ? -Dan */
|
||
|
+ return True;
|
||
|
}
|
||
|
|
||
|
Bool
|
||
|
--- util/wmsetup.c
|
||
|
+++ util/wmsetup.c
|
||
|
@@ -21,6 +21,7 @@
|
||
|
int
|
||
|
main()
|
||
|
{
|
||
|
+return 0;
|
||
|
}
|
||
|
#else
|
||
|
#define PROG_VERSION "wmsetup 0.0 (Window Maker)"
|