[Gaim-commits] CVS: gaim/src/win32 global.mak,1.5,1.6 libc_interface.h,1.9,1.10 untar.c,1.2,1.3 wspell.h,1.3,1.4

[Herman B. <her...@us...>]

Update of /cvsroot/gaim/gaim/src/win32
In directory sc8-pr-cvs1:/tmp/cvs-serv27513/src/win32

Modified Files:
	global.mak libc_interface.h untar.c wspell.h 
Log Message:
Update to mingw 3.0 and higher (gcc 3.2)

Index: global.mak
===================================================================
RCS file: /cvsroot/gaim/gaim/src/win32/global.mak,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -p -r1.5 -r1.6
--- global.mak	21 Jun 2003 00:59:24 -0000	1.5
+++ global.mak	12 Oct 2003 21:00:24 -0000	1.6
@@ -7,8 +7,10 @@
 
 CC = gcc.exe
 
-# Use -g flag when building debug version of Gaim (including plugins)
-CFLAGS += -O2 -Wall -mno-cygwin -fnative-struct
+# Use -g flag when building debug version of Gaim (including plugins).
+# Use -fnative-struct instead of -mms-bitfields when using mingw 1.1
+# (gcc 2.95)
+CFLAGS += -O2 -Wall -mno-cygwin -mms-bitfields
 
 # If not specified, dlls are built with the default base address of 0x10000000.
 # When loaded into a process address space a dll will be rebased if its base

Index: libc_interface.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/win32/libc_interface.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -p -r1.9 -r1.10
--- libc_interface.h	19 Aug 2003 16:07:08 -0000	1.9
+++ libc_interface.h	12 Oct 2003 21:00:25 -0000	1.10
@@ -30,74 +30,74 @@
 /* sys/socket.h */
 extern int wgaim_socket(int namespace, int style, int protocol);
 #define socket( namespace, style, protocol ) \
-wgaim_socket( ## namespace ##, ## style ##, ## protocol ## )
+wgaim_socket( namespace, style, protocol )
 
 extern int wgaim_connect(int socket, struct sockaddr *addr, u_long length);
 #define connect( socket, addr, length ) \
-wgaim_connect( ## socket ##, ## addr ##, ## length ## )
+wgaim_connect( socket, addr, length )
 
 extern int wgaim_getsockopt(int socket, int level, int optname, void *optval, unsigned int *optlenptr);
 #define getsockopt( args... ) \
-wgaim_getsockopt( ## args )
+wgaim_getsockopt( args )
 
 /* sys/ioctl.h */
 extern int wgaim_ioctl(int fd, int command, void* opt);
 #define ioctl( fd, command, val ) \
-wgaim_ioctl( ## fd ##, ## command ##, ## val ## )
+wgaim_ioctl( fd, command, val )
 
 /* fcntl.h */
 extern int wgaim_fcntl(int socket, int command, int val);
 #define fcntl( fd, command, val ) \
-wgaim_fcntl( ## fd ##, ## command ##, ## val ## )
+wgaim_fcntl( fd, command, val )
 
 #define open( args... ) _open( ## args )
 
 /* arpa/inet.h */
 extern int wgaim_inet_aton(const char *name, struct in_addr *addr);
 #define inet_aton( name, addr ) \
-wgaim_inet_aton( ## name ##, ## addr ## )
+wgaim_inet_aton( name, addr )
 
 /* netdb.h */
 extern struct hostent* wgaim_gethostbyname(const char *name);
 #define gethostbyname( name ) \
-wgaim_gethostbyname( ## name ## )
+wgaim_gethostbyname( name )
 
 /* netinet/in.h */
 #define ntohl( netlong ) \
-(unsigned int)ntohl( ## netlong ## )
+(unsigned int)ntohl( netlong )
 
 /* string.h */
 extern char* wgaim_strerror( int errornum );
 #define hstrerror( herror ) \
 wgaim_strerror( errno )
 #define strerror( errornum ) \
-wgaim_strerror( ## errornum ## )
+wgaim_strerror( errornum )
 
 extern char* wgaim_strsep(char **stringp, const char *delim);
 #define strsep( stringp, delim ) \
-wgaim_strsep( ## stringp ##, ## delim ## )
+wgaim_strsep( stringp, delim )
 
-#define bzero( dest, size ) memset( ## dest ##, 0, ## size ## )
+#define bzero( dest, size ) memset( dest, 0, size )
 
 /* unistd.h */
 extern int wgaim_read(int fd, void *buf, unsigned int size);
 #define read( fd, buf, buflen ) \
-wgaim_read( ## fd ##, ## buf ##, ## buflen ## )
+wgaim_read( fd, buf, buflen )
 
 extern int wgaim_write(int fd, const void *buf, unsigned int size);
 #define write( socket, buf, buflen ) \
-wgaim_write( ## socket ##, ## buf ##, ## buflen ## )
+wgaim_write( socket, buf, buflen )
 
 extern int wgaim_close(int fd);
 #define close( fd ) \
-wgaim_close( ## fd ## )
+wgaim_close( fd )
 
 #define sleep(x) Sleep((x)*1000)
 
 /* sys/time.h */
 extern int wgaim_gettimeofday(struct timeval *p, struct timezone *z);
 #define gettimeofday( timeval, timezone ) \
-wgaim_gettimeofday( ## timeval ##, ## timezone ## )
+wgaim_gettimeofday( timeval, timezone )
 
 /* stdio.h */
 #define snprintf _snprintf
@@ -105,7 +105,7 @@ wgaim_gettimeofday( ## timeval ##, ## ti
 
 extern int wgaim_rename(const char *oldname, const char *newname);
 #define rename( oldname, newname ) \
-wgaim_rename( ## oldname ##, ## newname ## )
+wgaim_rename( oldname, newname )
 
 /* sys/stat.h */
 #define mkdir(a,b) _mkdir((a))
@@ -114,6 +114,6 @@ wgaim_rename( ## oldname ##, ## newname 
 /* time.h */
 extern struct tm *wgaim_localtime_r(const time_t *time, struct tm *resultp);
 #define localtime_r( time, resultp ) \
-wgaim_localtime_r( ## time ##, ## resultp ## )
+wgaim_localtime_r( time, resultp )
 
 #endif /* _LIBC_INTERFACE_H_ */

Index: untar.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/win32/untar.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -p -r1.2 -r1.3
--- untar.c	11 Aug 2003 18:54:38 -0000	1.2
+++ untar.c	12 Oct 2003 21:00:25 -0000	1.3
@@ -80,8 +80,8 @@
 #include "untar.h"
 
 #define mkdir(a,b) _mkdir((a))
-#define untar_error( error, args... )      gaim_debug(GAIM_DEBUG_ERROR, "untar", ## error ## , ## args )
-#define untar_warning( warning, args... )  gaim_debug(GAIM_DEBUG_WARNING, "untar", ## warning ## , ## args )
+#define untar_error( error, args... )      gaim_debug(GAIM_DEBUG_ERROR, "untar", error, ## args )
+#define untar_warning( warning, args... )  gaim_debug(GAIM_DEBUG_WARNING, "untar", warning, ## args )
 #define untar_verbose( args... )           gaim_debug(GAIM_DEBUG_INFO, "untar", ## args )
  
 #define WSIZE	32768	/* size of decompression buffer */

Index: wspell.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/win32/wspell.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -p -r1.3 -r1.4
--- wspell.h	19 Aug 2003 16:07:08 -0000	1.3
+++ wspell.h	12 Oct 2003 21:00:25 -0000	1.4
@@ -28,22 +28,22 @@ extern void wgaim_gtkspell_init();
 
 extern GtkSpell* (*wgaim_gtkspell_new_attach)(GtkTextView*, const gchar*, GError**);
 #define gtkspell_new_attach( view, lang, error ) \
-wgaim_gtkspell_new_attach( ## view ##, ## lang ##, ## error ## )
+wgaim_gtkspell_new_attach( view, lang, error )
 
 extern GtkSpell* (*wgaim_gtkspell_get_from_text_view)(GtkTextView*);
 #define gtkspell_get_from_text_view( view ) \
-wgaim_gtkspell_get_from_text_view( ## view ## )
+wgaim_gtkspell_get_from_text_view( view )
 
 extern void (*wgaim_gtkspell_detach)(GtkSpell*);
 #define gtkspell_detach( spell ) \
-wgaim_gtkspell_detach( ## spell ## )
+wgaim_gtkspell_detach( spell )
 
 extern gboolean (*wgaim_gtkspell_set_language)(GtkSpell*,	const gchar*, GError**);
 #define gtkspell_set_language( spell, lang, error ) \
-wgaim_gtkspell_set_language( ## spell ##, ## lang ##, ## error ## )
+wgaim_gtkspell_set_language( spell, lang, error )
 
 extern void (*wgaim_gtkspell_recheck_all)(GtkSpell*);
 #define gtkspell_recheck_all( spell ) \
-wgaim_gtkspell_recheck_all( ## spell ## )
+wgaim_gtkspell_recheck_all( spell )
 
 #endif /* _WSPELL_H_ */