X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4c2d8a30f69e72a7b41473ced06026d8695f4b59..c8b34a16f79602ce1173a6f0ac0e5ae43b043da6:/Mingw32-gcc295.patches diff --git a/Mingw32-gcc295.patches b/Mingw32-gcc295.patches index 5de827a2ce..372729a723 100644 --- a/Mingw32-gcc295.patches +++ b/Mingw32-gcc295.patches @@ -75,8 +75,7 @@ STDMETHOD(GetTypeInfo)(THIS_ UINT,LCID,LPTYPEINFO*) PURE; ! STDMETHOD(GetIDsOfNames)(THIS_ REFIID,LPOLESTR*,UINT,LCID,DISPID) PURE; -! STDMETHOD(Invoked)(THIS_ -DISPID,REFIID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,UINT*) PURE; +! STDMETHOD(Invoked)(THIS_ DISPID,REFIID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,UINT*) PURE; }; #ifdef __cplusplus @@ -86,8 +85,7 @@ DISPID,REFIID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,UINT*) PURE; STDMETHOD(GetTypeInfo)(THIS_ UINT,LCID,LPTYPEINFO*) PURE; ! STDMETHOD(GetIDsOfNames)(THIS_ REFIID,LPOLESTR*,UINT,LCID,DISPID*) PURE; -! STDMETHOD(Invoke)(THIS_ -DISPID,REFIID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,UINT*) PURE; +! STDMETHOD(Invoke)(THIS_ DISPID,REFIID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,UINT*) PURE; }; #ifdef __cplusplus @@ -114,5 +112,58 @@ DISPID,REFIID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,UINT*) PURE; STDMETHOD(EnumDAdvise)(THIS_ IEnumSTATDATA**); +--- i386-mingw32\include\stdio.h Sun Aug 1 06:18:20 1999 ++++ stdio.h Sun Nov 7 03:41:40 1999 +@@ -203,9 +203,12 @@ + int fprintf (FILE* filePrintTo, const char* szFormat, ...); + int printf (const char* szFormat, ...); + int sprintf (char* caBuffer, const char* szFormat, ...); ++int _snprintf (char* caBuffer, size_t n, const char* szFormat, ...); + int vfprintf (FILE* filePrintTo, const char* szFormat, va_list varg); + int vprintf (const char* szFormat, va_list varg); + int vsprintf (char* caBuffer, const char* szFormat, va_list varg); ++int _vsnprintf (char* caBuffer, size_t n, const char* szFormat, ++ va_list varg); + + /* Wide character versions */ + int fwprintf (FILE* filePrintTo, const wchar_t* wsFormat, ...); + + + +--- i386-mingw32\include\winbase.h Sat Jul 31 17:48:48 1999 ++++ winbase.h Fri Feb 25 01:49:08 2000 +@@ -989,7 +989,7 @@ + BOOL WINAPI CopyFileExW(LPCWSTR,LPCWSTR,LPPROGRESS_ROUTINE,LPVOID,LPBOOL,DWORD); + #define RtlMoveMemory memmove + #define RtlCopyMemory memcpy +-#define RtlFillMemory memset ++#define RtlFillMemory(d,l,f) memset ((d),(f),(l)) + #define RtlZeroMemory(d,l) memset((d),0,(l)) + #define MoveMemory RtlMoveMemory + #define CopyMemory RtlCopyMemory + +--- i386-mingw32\include\winsock.h Sat Jul 31 17:48:50 1999 ++++ winsock.h Mon Mar 20 13:47:12 2000 +@@ -13,6 +13,10 @@ + #define _GNU_H_WINDOWS32_SOCKETS + #include + ++#ifdef __cplusplus ++extern "C" { ++#endif ++ + #ifndef _SYS_TYPES_H + typedef unsigned char u_char; + typedef unsigned short u_short; +@@ -495,4 +499,9 @@ + typedef struct timeval TIMEVAL; + typedef struct timeval *PTIMEVAL; + typedef struct timeval *LPTIMEVAL; ++ ++#ifdef __cplusplus ++} + #endif ++#endif ++