From 8a74debea8202db500c49ab46c3a302815d5fcd3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Fri, 1 Aug 2003 16:49:04 +0000 Subject: [PATCH] removed Mingw32-gcc295.patches ; it is obsolete for a long time git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22440 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- Mingw32-gcc295.patches | 169 ----------------------------------------- 1 file changed, 169 deletions(-) delete mode 100644 Mingw32-gcc295.patches diff --git a/Mingw32-gcc295.patches b/Mingw32-gcc295.patches deleted file mode 100644 index 372729a723..0000000000 --- a/Mingw32-gcc295.patches +++ /dev/null @@ -1,169 +0,0 @@ -*** \gcc-inc\basetyps.h Sat Jul 31 16:48:36 1999 ---- basetyps.h Fri Aug 06 11:14:36 1999 -*************** -*** 74,91 **** ---- 74,97 ---- - STDMETHOD(Clone)(IENUM_THIS_(I) I**) PURE; \ - } - #define DECLARE_ENUMERATOR(T) DECLARE_ENUMERATOR_(IEnum##T,T) - -+ #ifndef GUID_DEFINED -+ #define GUID_DEFINED - typedef struct _GUID - { - unsigned long Data1; - unsigned short Data2; - unsigned short Data3; - unsigned char Data4[8]; - } GUID; -+ #endif /* GUID_DEFINED */ - typedef GUID *REFGUID; - typedef GUID *LPGUID; -+ #ifndef UUID_DEFINED -+ #define UUID_DEFINED - typedef GUID UUID; -+ #endif /* UUID_DEFINED */ - typedef GUID IID; - typedef GUID CLSID; - typedef CLSID *LPCLSID; - typedef IID *LPIID; - - -*** \gcc-inc\oaidl.h Sat Jul 31 16:48:42 1999 ---- oaidl.h Fri Aug 06 13:18:48 1999 -*************** -*** 39,44 **** ---- 39,53 ---- - #define IMPLTYPEFLAG_FRESTRICTED 4 - #define IMPLTYPEFLAG_FDEFAULTVTABLE 8 - -+ #define DISPID_UNKNOWN ( -1 ) -+ #define DISPID_VALUE ( 0 ) -+ #define DISPID_PROPERTYPUT ( -3 ) -+ #define DISPID_NEWENUM ( -4 ) -+ #define DISPID_EVALUATE ( -5 ) -+ #define DISPID_CONSTRUCTOR ( -6 ) -+ #define DISPID_DESTRUCTOR ( -7 ) -+ #define DISPID_COLLECT ( -8 ) -+ - typedef interface ITypeLib *LPTYPELIB; - typedef interface ICreateTypeInfo *LPCREATETYPEINFO; - typedef interface ICreateTypeInfo2 *LPCREATETYPEINFO2; -*************** -*** 49,54 **** ---- 58,73 ---- - typedef interface IDispatch *LPDISPATCH; - typedef interface ICreateErrorInfo *LPCREATEERRORINFO; - -+ extern "C" const IID IID_ITypeLib; -+ extern "C" const IID IID_ICreateTypeInfo; -+ extern "C" const IID IID_ICreateTypeInfo2; -+ extern "C" const IID IID_ICreateTypeLib; -+ extern "C" const IID IID_ICreateTypeLib2; -+ extern "C" const IID IID_ITypeInfo; -+ extern "C" const IID IID_IErrorInfo; -+ extern "C" const IID IID_IDispatch; -+ extern "C" const IID IID_ICreateErrorInfo; -+ - typedef enum tagSYSKIND { - SYS_WIN16,SYS_WIN32,SYS_MAC - } SYSKIND; -*************** -*** 375,382 **** - STDMETHOD_(ULONG,Release)(THIS) PURE; - STDMETHOD(GetTypeInfoCount)(THIS_ UINT*) PURE; - 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; - }; - - #ifdef __cplusplus ---- 394,401 ---- - STDMETHOD_(ULONG,Release)(THIS) PURE; - STDMETHOD(GetTypeInfoCount)(THIS_ 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; - }; - - #ifdef __cplusplus - - -*** \gcc-inc\objidl.h Sat Jul 31 16:48:42 1999 ---- objidl.h Fri Aug 06 11:00:19 1999 -*************** -*** 627,633 **** - STDMETHOD(QueryGetData)(THIS_ FORMATETC*) PURE; - STDMETHOD(GetCanonicalFormatEtc)(THIS_ FORMATETC*,FORMATETC*) PURE; - STDMETHOD(SetData)(THIS_ FORMATETC*,STGMEDIUM*,BOOL) PURE; -! STDMETHOD(EnumFormatEtc)(THIS_ DWORD,IEnumFORMATETC*) PURE; - STDMETHOD(DAdvise)(THIS_ FORMATETC*,DWORD,IAdviseSink*,PDWORD) PURE; - STDMETHOD(DUnadvise)(THIS_ DWORD) PURE; - STDMETHOD(EnumDAdvise)(THIS_ IEnumSTATDATA**); ---- 627,633 ---- - STDMETHOD(QueryGetData)(THIS_ FORMATETC*) PURE; - STDMETHOD(GetCanonicalFormatEtc)(THIS_ FORMATETC*,FORMATETC*) PURE; - STDMETHOD(SetData)(THIS_ FORMATETC*,STGMEDIUM*,BOOL) PURE; -! STDMETHOD(EnumFormatEtc)(THIS_ DWORD,IEnumFORMATETC**) PURE; - STDMETHOD(DAdvise)(THIS_ FORMATETC*,DWORD,IAdviseSink*,PDWORD) PURE; - STDMETHOD(DUnadvise)(THIS_ DWORD) 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 -+ - -