# HG changeset patch # User Herman Bloggs # Date 1065992426 0 # Node ID 59ffe137176d80d538338e64ac9ad7107c9f5f4e # Parent 04e80607aff22fa41c24f9f94ab1f2e951eb5d4a [gaim-migrate @ 7817] Update to mingw 3.0 and higher (gcc 3.2) committer: Tailor Script diff -r 04e80607aff2 -r 59ffe137176d src/gtkconv.c --- a/src/gtkconv.c Sun Oct 12 18:40:28 2003 +0000 +++ b/src/gtkconv.c Sun Oct 12 21:00:26 2003 +0000 @@ -124,9 +124,9 @@ static void do_bold(GtkWidget *bold, GaimGtkConversation *gtkconv); static void do_italic(GtkWidget *italic, GaimGtkConversation *gtkconv); static void do_underline(GtkWidget *underline, GaimGtkConversation *gtkconv); -static void do_small(GtkWidget *small, GaimGtkConversation *gtkconv); -static void do_normal(GtkWidget *small, GaimGtkConversation *gtkconv); -static void do_big(GtkWidget *small, GaimGtkConversation *gtkconv); +static void do_small(GtkWidget *smalltb, GaimGtkConversation *gtkconv); +static void do_normal(GtkWidget *normal, GaimGtkConversation *gtkconv); +static void do_big(GtkWidget *large, GaimGtkConversation *gtkconv); static void toggle_font(GtkWidget *font, GaimConversation *conv); static void toggle_fg_color(GtkWidget *color, GaimConversation *conv); static void toggle_bg_color(GtkWidget *color, GaimConversation *conv); @@ -2092,9 +2092,9 @@ } static void -do_small(GtkWidget *small, GaimGtkConversation *gtkconv) +do_small(GtkWidget *smalltb, GaimGtkConversation *gtkconv) { - if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(small))) + if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(smalltb))) gaim_gtk_surround(gtkconv, "", ""); else gaim_gtk_advance_past(gtkconv, "", ""); diff -r 04e80607aff2 -r 59ffe137176d src/win32/IdleTracker/idletrack.c --- a/src/win32/IdleTracker/idletrack.c Sun Oct 12 18:40:28 2003 +0000 +++ b/src/win32/IdleTracker/idletrack.c Sun Oct 12 21:00:26 2003 +0000 @@ -10,14 +10,6 @@ #define EXPORT __declspec(dllexport) -/* from msdn docs */ -typedef struct tagMOUSEHOOKSTRUCT { - POINT pt; - HWND hwnd; - UINT wHitTestCode; - DWORD dwExtraInfo; -} MOUSEHOOKSTRUCT; - static HANDLE hMapObject = NULL; static DWORD *lastTime = NULL; static HHOOK keyHook = NULL; diff -r 04e80607aff2 -r 59ffe137176d src/win32/global.mak --- a/src/win32/global.mak Sun Oct 12 18:40:28 2003 +0000 +++ b/src/win32/global.mak Sun Oct 12 21:00:26 2003 +0000 @@ -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 diff -r 04e80607aff2 -r 59ffe137176d src/win32/libc_interface.h --- a/src/win32/libc_interface.h Sun Oct 12 18:40:28 2003 +0000 +++ b/src/win32/libc_interface.h Sun Oct 12 21:00:26 2003 +0000 @@ -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 @@ 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 @@ /* 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_ */ diff -r 04e80607aff2 -r 59ffe137176d src/win32/untar.c --- a/src/win32/untar.c Sun Oct 12 18:40:28 2003 +0000 +++ b/src/win32/untar.c Sun Oct 12 21:00:26 2003 +0000 @@ -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 */ diff -r 04e80607aff2 -r 59ffe137176d src/win32/wspell.h --- a/src/win32/wspell.h Sun Oct 12 18:40:28 2003 +0000 +++ b/src/win32/wspell.h Sun Oct 12 21:00:26 2003 +0000 @@ -28,22 +28,22 @@ 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_ */