Mercurial > pidgin.yaz
changeset 11441:9f6df41df587
[gaim-migrate @ 13678]
Update for win32api-3.3. The mingw_plus stuff isn't necessary anymore :). Define _WIN32_WINNT 0x0501 for src/*, this fixes a compile error for getaddrinfo - this *shouldn't* break Win98/ME because the functions are still there - just defined in a different header.
committer: Tailor Script <tailor@pidgin.im>
| author | Daniel Atallah <daniel.atallah@gmail.com> |
|---|---|
| date | Sun, 04 Sep 2005 18:30:15 +0000 |
| parents | 5938f6b386fa |
| children | 73f7cfa46f1b |
| files | src/Makefile.am src/Makefile.mingw src/win32/mingw_plus/.cvsignore src/win32/mingw_plus/winuser_extra.h src/win32/win32dep.c src/win_gaim.c |
| diffstat | 5 files changed, 1 insertions(+), 41 deletions(-) [+] |
line wrap: on
line diff
--- a/src/Makefile.am Sun Sep 04 18:22:45 2005 +0000 +++ b/src/Makefile.am Sun Sep 04 18:30:15 2005 +0000 @@ -23,7 +23,6 @@ win32/win32dep.h \ win32/wspell.c \ win32/wspell.h \ - win32/mingw_plus/winuser_extra.h \ win32/nsis/gaim-header.bmp \ win32/nsis/gaim-intro.bmp \ win32/nsis/langmacros.nsh \
--- a/src/Makefile.mingw Sun Sep 04 18:22:45 2005 +0000 +++ b/src/Makefile.mingw Sun Sep 04 18:30:15 2005 +0000 @@ -16,7 +16,6 @@ GTKSPELL_TOP := ../../win32-dev/gtkspell-2.0.6 IDLETRACK_TOP := $(GAIM_TOP)/src/win32/IdleTracker GAIM_INSTALL_DIR := $(GAIM_TOP)/win32-install-dir -MINGW_PLUS_DIR := $(GAIM_SRC)/win32/mingw_plus NSS_DIR := ../../win32-dev/nss-3.9 NSPR_DIR := ../../win32-dev/nspr-4.4.1 @@ -30,7 +29,7 @@ CFLAGS = -DEFINES = +DEFINES = -D_WIN32_WINNT=0x0501 LDFLAGS = -mwindows @@ -51,7 +50,6 @@ INCLUDE_PATHS = -I$(INCLUDE_DIR) \ -I$(INCLUDE_DIR)/win32 \ - -I$(MINGW_PLUS_DIR) \ -I$(IDLETRACK_TOP) \ -I$(GAIM_TOP) \ -I$(GTK_TOP)/include \
--- a/src/win32/mingw_plus/winuser_extra.h Sun Sep 04 18:22:45 2005 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,28 +0,0 @@ -/* - * winuser_extra.h - * - * Description: The following is missing from mingw 1.1 - */ - -#ifndef _WINUSER_EXTRA_H_ -#define _WINUSER_EXTRA_H_ - -/* From MSDN Lib - Mingw doesn't have */ -#define FLASHW_STOP 0 -#define FLASHW_CAPTION 0x00000001 -#define FLASHW_TRAY 0x00000002 -#define FLASHW_ALL (FLASHW_CAPTION | FLASHW_TRAY) -#define FLASHW_TIMER 0x00000004 -#define FLASHW_TIMERNOFG 0x0000000C - - -/* From MSDN Lib - Mingw doesn't have */ -typedef struct { - UINT cbSize; - HWND hwnd; - DWORD dwFlags; - UINT uCount; - DWORD dwTimeout; -} FLASHWINFO, *PFLASHWINFO; - -#endif /* _WINUSER_EXTRA_H_ */
--- a/src/win32/win32dep.c Sun Sep 04 18:22:45 2005 +0000 +++ b/src/win32/win32dep.c Sun Sep 04 18:30:15 2005 +0000 @@ -40,7 +40,6 @@ #include "stdafx.h" #include "resource.h" #include "MinimizeToTray.h" -#include "winuser_extra.h" #include "idletrack.h" #include "zlib.h" #include "untar.h"
--- a/src/win_gaim.c Sun Sep 04 18:22:45 2005 +0000 +++ b/src/win_gaim.c Sun Sep 04 18:30:15 2005 +0000 @@ -25,20 +25,12 @@ * */ -#ifndef _WIN32_WINNT -# define _WIN32_WINNT 0x0501 -#endif #include <windows.h> #include <fcntl.h> #include <stdlib.h> #include <string.h> #include <stdio.h> -/** Currently missing from win32-api */ -#ifndef ATTACH_PARENT_PROCESS -# define ATTACH_PARENT_PROCESS -1 -#endif - #define WIN32_PROXY_REGKEY "Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings" typedef int (CALLBACK* LPFNGAIMMAIN)(HINSTANCE, int, char**);