On Fri, 9 Jun 2000 [EMAIL PROTECTED] wrote:
> At this point, I really want to get 0.7.10 out the door.
Here are two patches to make 0.7.9 compile with gcc 2.96 (even stricter
type checking) and on glibc 2.2 based systems (glibc 2.2 defines
strcasecmp differently because of its better exception handling support,
so wv.h's definition must not be used).
Not sure whether they're still needed with current CVS, I'll try to check
this before Monday.
LLaP
bero
--- abi-0.7.9/src/af/ev/unix/gnome/ev_UnixGnomeMenu.cpp.gcc296 Fri Jun 9 08:50:24
2000
+++ abi-0.7.9/src/af/ev/unix/gnome/ev_UnixGnomeMenu.cpp Fri Jun 9 08:50:41 2000
@@ -345,7 +345,7 @@
retval[i].label = g_strdup (buf);
retval[i].hint = g_strdup (tooltip);
- retval[i].moreinfo = menuEvent;
+ retval[i].moreinfo = (void*)menuEvent;
retval[i].user_data = g_malloc (sizeof(__Aux));
((__Aux *) retval[i].user_data)->me = this;
((__Aux *) retval[i].user_data)->id = id;
--- abi-0.7.9/src/wp/ap/unix/ap_UnixDialog_Spell.cpp.gcc296 Fri Jun 9 08:56:16
2000
+++ abi-0.7.9/src/wp/ap/unix/ap_UnixDialog_Spell.cpp Fri Jun 9 08:56:30 2000
@@ -21,6 +21,7 @@
// TODO: still getting some artifacts when doing highligh/replacements
#include <stdlib.h>
+#include <string.h>
#include "ut_string.h"
#include "ut_assert.h"
--- wv/wv.h.glibc22 Fri Jun 9 09:04:02 2000
+++ wv/wv.h Fri Jun 9 09:14:51 2000
@@ -8,7 +8,9 @@
#ifdef WIN32
#define strcasecmp(s1,s2) stricmp(s1,s2)
#else
+#if !defined(__GLIBC__) || (__GLIBC__ < 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 2)
int strcasecmp(const char *s1, const char *s2);
+#endif
#endif
int getopt(int argc, char * const argv[], const char *optstring);
--- wv/strcasecmp.c.glibc22 Fri Jun 9 09:13:12 2000
+++ wv/strcasecmp.c Fri Jun 9 09:14:30 2000
@@ -1,3 +1,4 @@
+#if !defined(__GLIBC__) || (__GLIBC__ < 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 2)
#include <ctype.h>
#include <string.h>
@@ -11,3 +12,4 @@
return(1);
return(0);
}
+#endif
