David, thanks for the suggestion, but I'm sticking to __WINESRC__.
It's shorter, and starts with WINE, which is preferred IMO. :)
ChangeLog
Rename __WINE__ to __WINESRC__
Index: ./include/commctrl.h
===================================================================
RCS file: /var/cvs/wine/include/commctrl.h,v
retrieving revision 1.102
diff -u -r1.102 commctrl.h
--- ./include/commctrl.h 24 Dec 2002 00:26:41 -0000 1.102
+++ ./include/commctrl.h 3 Jan 2003 20:57:03 -0000
@@ -599,7 +599,7 @@
BOOL WINAPI ImageList_Write(HIMAGELIST, LPSTREAM);
#endif
-#ifndef __WINE__
+#ifndef __WINESRC__
#define ImageList_AddIcon(himl,hicon) ImageList_ReplaceIcon(himl,-1,hicon)
#endif
#define ImageList_ExtractIcon(hi,himl,i) ImageList_GetIcon(himl,i,0)
Index: ./include/mmddk.h
===================================================================
RCS file: /var/cvs/wine/include/mmddk.h,v
retrieving revision 1.14
diff -u -r1.14 mmddk.h
--- ./include/mmddk.h 31 Oct 2002 02:23:43 -0000 1.14
+++ ./include/mmddk.h 3 Jan 2003 20:57:03 -0000
@@ -79,7 +79,7 @@
#define DRV_QUERYNAME (DRV_RESERVED + 3)
#define DRV_QUERYDRIVERIDS (DRV_RESERVED + 4)
#define DRV_QUERYMAPPABLE (DRV_RESERVED + 5)
-#ifdef __WINE__
+#ifdef __WINESRC__
#define DRV_QUERYDSOUNDIFACE (DRV_RESERVED + 10)
#endif
Index: ./include/wtypes.h
===================================================================
RCS file: /var/cvs/wine/include/wtypes.h,v
retrieving revision 1.41
diff -u -r1.41 wtypes.h
--- ./include/wtypes.h 19 Dec 2002 21:13:58 -0000 1.41
+++ ./include/wtypes.h 3 Jan 2003 20:57:03 -0000
@@ -151,7 +151,7 @@
typedef const OLECHAR *LPCOLESTR;
-#ifndef __WINE__
+#ifndef __WINESRC__
#define OLESTR(str) WINE_UNICODE_TEXT(str)
#endif
typedef CHAR OLECHAR16;
Index: ./include/mmsystem.h
===================================================================
RCS file: /var/cvs/wine/include/mmsystem.h,v
retrieving revision 1.60
diff -u -r1.60 mmsystem.h
--- ./include/mmsystem.h 15 Dec 2002 02:59:50 -0000 1.60
+++ ./include/mmsystem.h 3 Jan 2003 20:57:03 -0000
@@ -228,7 +228,7 @@
HMODULE WINAPI GetDriverModuleHandle(HDRVR hDriver);
DWORD WINAPI GetDriverFlags(HDRVR hDriver);
-#ifdef __WINE__
+#ifdef __WINESRC__
/* this call (GetDriverFlags) is not documented, nor the flags returned.
* here are Wine only definitions
*/
@@ -303,7 +303,7 @@
#define WAVE_MAPPED 0x0004
#define WAVE_FORMAT_DIRECT 0x0008
#define WAVE_FORMAT_DIRECT_QUERY (WAVE_FORMAT_QUERY | WAVE_FORMAT_DIRECT)
-#ifdef __WINE__
+#ifdef __WINESRC__
#define WAVE_DIRECTSOUND 0x0080
#endif
Index: ./include/winnt.h
===================================================================
RCS file: /var/cvs/wine/include/winnt.h,v
retrieving revision 1.147
diff -u -r1.147 winnt.h
--- ./include/winnt.h 19 Dec 2002 21:12:35 -0000 1.147
+++ ./include/winnt.h 3 Jan 2003 20:57:03 -0000
@@ -136,12 +136,12 @@
/* Anonymous union/struct handling */
-#ifdef __WINE__
+#ifdef __WINESRC__
# define NONAMELESSSTRUCT
# define NONAMELESSUNION
#else
@@ -266,7 +266,7 @@
# define EXTERN_C extern
#endif
-#ifndef __WINE__
+#ifndef __WINESRC__
#define STDMETHODCALLTYPE __stdcall
#define STDMETHODVCALLTYPE __cdecl
#define STDAPICALLTYPE __stdcall
@@ -328,7 +328,7 @@
* the emulator. The reason is they depend on the UNICODE
* macro which only exists in the user's code.
*/
-#ifndef __WINE__
+#ifndef __WINESRC__
# ifdef WINE_UNICODE_REWRITE
/* Use this if your compiler does not provide a 16bit wchar_t type.
@@ -379,7 +379,7 @@
# define __TEXT(string) string
# endif /* UNICODE */
# define TEXT(quote) __TEXT(quote)
-#endif /* __WINE__ */
+#endif /* __WINESRC__ */
/* Misc common WIN32 types */
typedef char CCHAR;
@@ -474,7 +474,7 @@
#define MEM_MAPPED 0x00040000
#define MEM_RESET 0x00080000
#define MEM_TOP_DOWN 0x00100000
-#ifdef __WINE__
+#ifdef __WINESRC__
#define MEM_SYSTEM 0x80000000
#endif
@@ -1132,7 +1132,7 @@
typedef CONTEXT *PCONTEXT;
-#ifdef __WINE__
+#ifdef __WINESRC__
/* Macros to retrieve the current context */
@@ -1269,7 +1269,7 @@
#error You need to define DEFINE_REGS_ENTRYPOINT macros for your CPU
#endif
-#endif /* __WINE__ */
+#endif /* __WINESRC__ */
/*
* Language IDs
Index: ./include/windef.h
===================================================================
RCS file: /var/cvs/wine/include/windef.h,v
retrieving revision 1.80
diff -u -r1.80 windef.h
--- ./include/windef.h 10 Dec 2002 22:56:44 -0000 1.80
+++ ./include/windef.h 3 Jan 2003 20:57:03 -0000
@@ -21,9 +21,9 @@
#ifndef __WINE_WINDEF_H
#define __WINE_WINDEF_H
-#ifdef __WINE__
+#ifdef __WINESRC__
# undef UNICODE
-#endif /* __WINE__ */
+#endif /* __WINESRC__ */
#ifndef WINVER
#define WINVER 0x0500
@@ -58,7 +58,7 @@
# define __cdecl
#endif /* __i386__ */
-#ifndef __WINE__
+#ifndef __WINESRC__
#ifndef pascal
#define pascal __stdcall
@@ -111,7 +111,7 @@
#define __declspec(x)
#endif
-#endif /* __WINE__ */
+#endif /* __WINESRC__ */
#define CALLBACK __stdcall
#define WINAPI __stdcall
@@ -175,26 +175,26 @@
#include "winnt.h"
/* Macros to map Winelib names to the correct implementation name */
-/* depending on __WINE__ and UNICODE macros. */
+/* depending on __WINESRC__ and UNICODE macros. */
/* Note that Winelib is purely Win32. */
-#ifdef __WINE__
+#ifdef __WINESRC__
# define WINELIB_NAME_AW(func) \
func##_must_be_suffixed_with_W_or_A_in_this_context \
func##_must_be_suffixed_with_W_or_A_in_this_context
-#else /* __WINE__ */
+#else /* __WINESRC__ */
# ifdef UNICODE
# define WINELIB_NAME_AW(func) func##W
# else
# define WINELIB_NAME_AW(func) func##A
# endif /* UNICODE */
-#endif /* __WINE__ */
+#endif /* __WINESRC__ */
-#ifdef __WINE__
+#ifdef __WINESRC__
# define DECL_WINELIB_TYPE_AW(type) /* nothing */
-#else /* __WINE__ */
+#else /* __WINESRC__ */
# define DECL_WINELIB_TYPE_AW(type) typedef WINELIB_NAME_AW(type) type;
-#endif /* __WINE__ */
+#endif /* __WINESRC__ */
/* Integer types */
Index: ./include/oaidl.h
===================================================================
RCS file: /var/cvs/wine/include/oaidl.h,v
retrieving revision 1.9
diff -u -r1.9 oaidl.h
--- ./include/oaidl.h 3 Jan 2003 19:12:55 -0000 1.9
+++ ./include/oaidl.h 3 Jan 2003 20:57:03 -0000
@@ -26,7 +26,7 @@
#ifndef __WINE_OAIDL_H
#define __WINE_OAIDL_H
-#if defined(__WINE__) && !defined(INITGUID) && !defined(__WINE_INCLUDE_OAIDL)
+#if defined(__WINESRC__) && !defined(INITGUID) && !defined(__WINE_INCLUDE_OAIDL)
#error DO NOT INCLUDE DIRECTLY
#endif
Index: ./include/objbase.h
===================================================================
RCS file: /var/cvs/wine/include/objbase.h,v
retrieving revision 1.27
diff -u -r1.27 objbase.h
--- ./include/objbase.h 23 Dec 2002 01:41:51 -0000 1.27
+++ ./include/objbase.h 3 Jan 2003 20:57:03 -0000
@@ -805,7 +805,7 @@
#define ICOM_CALL26(xfn, ptr,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z) ICOM_VTBL(ptr)->xfn(ptr,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z)
-#ifndef __WINE__
+#ifndef __WINESRC__
/* These macros are msdev's way of defining COM objects.
* They are provided here for use by Winelib developpers.
*/
@@ -859,6 +859,6 @@
#endif /* __cplusplus && !CINTERFACE */
-#endif /* __WINE__ */
+#endif /* __WINESRC__ */
#endif /* _OBJBASE_H_ */
Index: ./include/objidl.h
===================================================================
RCS file: /var/cvs/wine/include/objidl.h,v
retrieving revision 1.9
diff -u -r1.9 objidl.h
--- ./include/objidl.h 19 Dec 2002 22:15:24 -0000 1.9
+++ ./include/objidl.h 3 Jan 2003 20:57:03 -0000
@@ -1711,7 +1711,7 @@
PRPC_MESSAGE pRpcMessage,
DWORD* pdwStubPhase);
-#ifdef __WINE__
+#ifdef __WINESRC__
#undef GetObject
#endif
typedef IRunningObjectTable *LPRUNNINGOBJECTTABLE;
Index: ./include/ocidl.h
===================================================================
RCS file: /var/cvs/wine/include/ocidl.h,v
retrieving revision 1.9
diff -u -r1.9 ocidl.h
--- ./include/ocidl.h 3 Jan 2003 19:12:55 -0000 1.9
+++ ./include/ocidl.h 3 Jan 2003 20:57:03 -0000
@@ -26,7 +26,7 @@
#ifndef __WINE_OCIDL_H
#define __WINE_OCIDL_H
-#if defined(__WINE__) && !defined(INITGUID) && !defined(__WINE_INCLUDE_OCIDL)
+#if defined(__WINESRC__) && !defined(INITGUID) && !defined(__WINE_INCLUDE_OCIDL)
#error DO NOT INCLUDE DIRECTLY
#endif
Index: ./include/oleidl.h
===================================================================
RCS file: /var/cvs/wine/include/oleidl.h,v
retrieving revision 1.9
diff -u -r1.9 oleidl.h
--- ./include/oleidl.h 3 Jan 2003 19:12:55 -0000 1.9
+++ ./include/oleidl.h 3 Jan 2003 20:57:04 -0000
@@ -26,7 +26,7 @@
#ifndef __WINE_OLEIDL_H
#define __WINE_OLEIDL_H
-#if defined(__WINE__) && !defined(INITGUID) && !defined(__WINE_INCLUDE_OLEIDL)
+#if defined(__WINESRC__) && !defined(INITGUID) && !defined(__WINE_INCLUDE_OLEIDL)
#error DO NOT INCLUDE DIRECTLY
#endif
Index: ./include/prsht.h
===================================================================
RCS file: /var/cvs/wine/include/prsht.h,v
retrieving revision 1.22
diff -u -r1.22 prsht.h
--- ./include/prsht.h 6 Dec 2002 23:19:54 -0000 1.22
+++ ./include/prsht.h 3 Jan 2003 20:57:04 -0000
@@ -264,7 +264,7 @@
#define PSH_WIZARD_LITE 0x00400000
#define PSH_WIZARD97_NEW 0x01000000 /* for IE >= 5 */
#define PSH_NOCONTEXTHELP 0x02000000
-#ifndef __WINE__
+#ifndef __WINESRC__
# if _WIN32_IE < 0x0500
# define PSH_WIZARD97 PSH_WIZARD97_OLD
# else
Index: ./include/rpc.h
===================================================================
RCS file: /var/cvs/wine/include/rpc.h,v
retrieving revision 1.12
diff -u -r1.12 rpc.h
--- ./include/rpc.h 18 Dec 2002 02:21:38 -0000 1.12
+++ ./include/rpc.h 3 Jan 2003 20:57:04 -0000
@@ -18,7 +18,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#if !defined(RPC_NO_WINDOWS_H) && !defined(__WINE__)
+#if !defined(RPC_NO_WINDOWS_H) && !defined(__WINESRC__)
#include "windows.h"
#endif
Index: ./include/rpcdce.h
===================================================================
RCS file: /var/cvs/wine/include/rpcdce.h,v
retrieving revision 1.16
diff -u -r1.16 rpcdce.h
--- ./include/rpcdce.h 24 Dec 2002 00:26:55 -0000 1.16
+++ ./include/rpcdce.h 3 Jan 2003 20:57:04 -0000
@@ -21,7 +21,7 @@
#include "windef.h"
-/* avoid delving into windows.h ifndef __WINE__; this
+/* avoid delving into windows.h ifndef __WINESRC__; this
would pull in rpcndr.h, which needs rpcdcep.h, which
needs us, in turn, causing a compile failure */
#ifndef RPC_NO_WINDOWS_H
Index: ./include/rpcproxy.h
===================================================================
RCS file: /var/cvs/wine/include/rpcproxy.h,v
retrieving revision 1.6
diff -u -r1.6 rpcproxy.h
--- ./include/rpcproxy.h 19 Oct 2002 19:17:37 -0000 1.6
+++ ./include/rpcproxy.h 3 Jan 2003 20:57:04 -0000
@@ -195,7 +195,7 @@
#define IID_GENERIC_CHECK_IID(name,pIID,index) memcmp(pIID, name##_ProxyVtblList[index]->header.piid, sizeof(IID))
-#if defined(__WINE__) && defined(__WINE_WINE_OBJ_OLEAUT_H)
+#if defined(__WINESRC__) && defined(__WINE_WINE_OBJ_OLEAUT_H)
/* see http://msdn.microsoft.com/library/en-us/dnmsj99/html/com0199.asp?frame=true */
RPCRTAPI HRESULT RPC_ENTRY
Index: ./include/shlwapi.h
===================================================================
RCS file: /var/cvs/wine/include/shlwapi.h,v
retrieving revision 1.32
diff -u -r1.32 shlwapi.h
--- ./include/shlwapi.h 12 Nov 2002 01:05:00 -0000 1.32
+++ ./include/shlwapi.h 3 Jan 2003 20:57:04 -0000
@@ -715,7 +715,7 @@
/* A/W Pairing is broken for this function */
LPSTR WINAPI StrFormatByteSize64A (LONGLONG,LPSTR,UINT);
LPWSTR WINAPI StrFormatByteSizeW (LONGLONG,LPWSTR,UINT);
-#ifndef __WINE__
+#ifndef __WINESRC__
#ifdef UNICODE
#define StrFormatByteSize StrFormatByteSizeW
#else
Index: ./include/tchar.h
===================================================================
RCS file: /var/cvs/wine/include/tchar.h,v
retrieving revision 1.18
diff -u -r1.18 tchar.h
--- ./include/tchar.h 31 May 2002 23:06:49 -0000 1.18
+++ ./include/tchar.h 3 Jan 2003 20:57:04 -0000
@@ -19,7 +19,7 @@
#ifndef __WINE_TCHAR_H
#define __WINE_TCHAR_H
-#ifdef __WINE__
+#ifdef __WINESRC__
#error Wine should not include tchar.h internally
#endif
Index: ./include/winbase.h
===================================================================
RCS file: /var/cvs/wine/include/winbase.h,v
retrieving revision 1.175
diff -u -r1.175 winbase.h
--- ./include/winbase.h 19 Dec 2002 01:03:48 -0000 1.175
+++ ./include/winbase.h 3 Jan 2003 20:57:04 -0000
@@ -25,7 +25,7 @@
#include "basetsd.h"
#include "windef.h"
-#ifndef __WINE__
+#ifndef __WINESRC__
#include "winerror.h"
#endif
@@ -830,7 +830,7 @@
#define FORMAT_MESSAGE_ARGUMENT_ARRAY 0x00002000
#define FORMAT_MESSAGE_MAX_WIDTH_MASK 0x000000FF
-#ifdef __WINE__
+#ifdef __WINESRC__
#define CRITICAL_SECTION_INIT(name) { (void *)(__FILE__ ": " name), -1, 0, 0, 0, 0 }
#endif
@@ -1946,7 +1946,7 @@
return (PVOID)InterlockedExchange( (PLONG)dest, (LONG)val );
}
-#ifdef __WINE__
+#ifdef __WINESRC__
#define GetCurrentProcess() ((HANDLE)0xffffffff)
#define GetCurrentThread() ((HANDLE)0xfffffffe)
#endif
Index: ./include/winsock.h
===================================================================
RCS file: /var/cvs/wine/include/winsock.h,v
retrieving revision 1.49
diff -u -r1.49 winsock.h
--- ./include/winsock.h 21 Nov 2002 23:44:19 -0000 1.49
+++ ./include/winsock.h 3 Jan 2003 20:57:04 -0000
@@ -20,13 +20,13 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifdef __WINE__
+#ifdef __WINESRC__
# ifndef __WINE_WINSOCK2__
# error Please use Winsock2 in Wine
# endif
#endif
-#ifndef __WINE__
+#ifndef __WINESRC__
# include "windows.h"
#else
# include "windef.h"
@@ -720,7 +725,7 @@
#define FD_CLOSE 0x00000020
/* internal per-socket flags */
-#ifdef __WINE__
+#ifdef __WINESRC__
#define FD_WINE_LISTENING 0x10000000
#define FD_WINE_NONBLOCKING 0x20000000
#define FD_WINE_CONNECTED 0x40000000
@@ -935,14 +935,18 @@
u_long WINAPI WS(ntohl)(u_long);
u_short WINAPI WS(ntohs)(u_short);
-#if defined(__WINE__) || !defined(__WINE_WINSOCK2__)
+#if defined(__WINESRC__) || !defined(__WINE_WINSOCK2__)
/* Stuff specific to winsock.h */
#include "mswsock.h"
Index: ./include/d3d8types.h
===================================================================
RCS file: /var/cvs/wine/include/d3d8types.h,v
retrieving revision 1.6
diff -u -r1.6 d3d8types.h
--- ./include/d3d8types.h 2 Jan 2003 17:59:01 -0000 1.6
+++ ./include/d3d8types.h 3 Jan 2003 20:57:04 -0000
@@ -988,7 +988,7 @@
char Driver[MAX_DEVICE_IDENTIFIER_STRING];
char Description[MAX_DEVICE_IDENTIFIER_STRING];
-#if defined(_WIN32) || defined(__WINE__)
+#if defined(_WIN32) || defined(__WINESRC__)
LARGE_INTEGER DriverVersion; /* Defined for 32-bit components */
#else
DWORD DriverVersionLowPart; /* Defined for 16-bit driver components */
Index: ./include/windows.h
===================================================================
RCS file: /var/cvs/wine/include/windows.h,v
retrieving revision 1.58
diff -u -r1.58 windows.h
--- ./include/windows.h 23 Dec 2002 01:46:34 -0000 1.58
+++ ./include/windows.h 3 Jan 2003 20:57:04 -0000
@@ -19,7 +19,7 @@
#ifndef __WINE_WINDOWS_H
#define __WINE_WINDOWS_H
-#ifdef __WINE__
+#ifdef __WINESRC__
#error Wine should not include windows.h internally
#endif
Index: ./include/winternl.h
===================================================================
RCS file: /var/cvs/wine/include/winternl.h,v
retrieving revision 1.10
diff -u -r1.10 winternl.h
--- ./include/winternl.h 18 Dec 2002 02:31:33 -0000 1.10
+++ ./include/winternl.h 3 Jan 2003 20:57:04 -0000
@@ -475,7 +475,7 @@
} OBJECT_ATTRIBUTES, *POBJECT_ATTRIBUTES;
typedef struct _PROCESS_BASIC_INFORMATION {
-#ifdef __WINE__
+#ifdef __WINESRC__
DWORD ExitStatus;
DWORD PebBaseAddress;
DWORD AffinityMask;
@@ -556,7 +556,7 @@
/* System Information Class 0x00 */
typedef struct _SYSTEM_BASIC_INFORMATION {
-#ifdef __WINE__
+#ifdef __WINESRC__
DWORD dwUnknown1;
ULONG uKeMaximumIncrement;
ULONG uPageSize;
@@ -645,7 +645,7 @@
/* System Information Class 0x02 */
typedef struct _SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION {
-#ifdef __WINE__
+#ifdef __WINESRC__
LARGE_INTEGER liIdleTime;
DWORD dwSpare[76];
#else
@@ -659,7 +659,7 @@
/* System Information Class 0x05 */
typedef struct _SYSTEM_PROCESS_INFORMATION {
-#ifdef __WINE__
+#ifdef __WINESRC__
DWORD dwOffset;
DWORD dwThreadCount;
DWORD dwUnknown1[6];
@@ -714,7 +714,7 @@
/* System Information Class 0x03 */
typedef struct _SYSTEM_TIMEOFDAY_INFORMATION {
-#ifdef __WINE__
+#ifdef __WINESRC__
LARGE_INTEGER liKeBootTime;
LARGE_INTEGER liKeSystemTime;
LARGE_INTEGER liExpTimeZoneBias;
Index: ./include/wownt32.h
===================================================================
RCS file: /var/cvs/wine/include/wownt32.h,v
retrieving revision 1.6
diff -u -r1.6 wownt32.h
--- ./include/wownt32.h 18 Oct 2002 23:35:24 -0000 1.6
+++ ./include/wownt32.h 3 Jan 2003 20:57:04 -0000
@@ -59,7 +59,7 @@
HANDLE WINAPI WOWHandle32(WORD,WOW_HANDLE_TYPE);
WORD WINAPI WOWHandle16(HANDLE,WOW_HANDLE_TYPE);
-#ifdef __WINE__
+#ifdef __WINESRC__
/* under Wine use the kernel functions directly so we don't have to import wow32 */
HANDLE WINAPI K32WOWHandle32(WORD,WOW_HANDLE_TYPE);
WORD WINAPI K32WOWHandle16(HANDLE,WOW_HANDLE_TYPE);
@@ -67,7 +67,7 @@
#define WOWHandle16 K32WOWHandle16
#endif
-#ifdef __WINE__
+#ifdef __WINESRC__
/* under Wine we use optimized versions where we can */
#define HWND_32(h16) ((HWND) (ULONG_PTR)(h16))
#define HMENU_32(h16) ((HMENU) (ULONG_PTR)(h16))
@@ -95,7 +95,7 @@
#define HPEN_16(h32) (LOWORD(h32))
#define HACCEL_16(h32) (LOWORD(h32))
-#else /* __WINE__ */
+#else /* __WINESRC__ */
#define HWND_32(h16) ((HWND) (WOWHandle32(h16, WOW_TYPE_HWND)))
#define HMENU_32(h16) ((HMENU) (WOWHandle32(h16, WOW_TYPE_HMENU)))
@@ -123,7 +123,7 @@
#define HPEN_16(h32) (WOWHandle16(h32, WOW_TYPE_HPEN))
#define HACCEL_16(h32) (WOWHandle16(h32, WOW_TYPE_HACCEL))
-#endif /* __WINE__ */
+#endif /* __WINESRC__ */
#define HMETAFILE_32(h16) ((HMETAFILE)(WOWHandle32(h16, WOW_TYPE_HMETAFILE)))
#define HTASK_32(h16) ((DWORD)(WOWHandle32(h16, WOW_TYPE_HTASK)))
Index: ./include/wtypes.idl
===================================================================
RCS file: /var/cvs/wine/include/wtypes.idl,v
retrieving revision 1.6
diff -u -r1.6 wtypes.idl
--- ./include/wtypes.idl 19 Dec 2002 21:13:58 -0000 1.6
+++ ./include/wtypes.idl 3 Jan 2003 20:59:21 -0000
@@ -153,7 +153,7 @@
typedef WCHAR OLECHAR;
typedef [string] OLECHAR *LPOLESTR;
typedef [string] const OLECHAR *LPCOLESTR;
-cpp_quote("#ifndef __WINE__")
+cpp_quote("#ifndef __WINESRC__")
cpp_quote("#define OLESTR(str) WINE_UNICODE_TEXT(str)")
cpp_quote("#endif")
Index: ./include/objidl.idl
===================================================================
RCS file: /var/cvs/wine/include/objidl.idl,v
retrieving revision 1.1
diff -u -r1.1 objidl.idl
--- ./include/objidl.idl 19 Dec 2002 22:15:24 -0000 1.1
+++ ./include/objidl.idl 3 Jan 2003 20:59:21 -0000
@@ -424,10 +424,10 @@
}
/* GetObject is defined in wingdi.h as WINELIB_NAME_AW(GetObject),
- * which resolves to a compilation failure if __WINE__ is defined,
+ * which resolves to a compilation failure if __WINESRC__ is defined,
* but GetObject is used as a valid method name below, so we have
- * to undefine it if __WINE__ is defined */
-cpp_quote("#ifdef __WINE__")
+ * to undefine it if __WINESRC__ is defined */
+cpp_quote("#ifdef __WINESRC__")
cpp_quote("#undef GetObject")
cpp_quote("#endif")
Index: ./include/msvcrt/eh.h
===================================================================
RCS file: /var/cvs/wine/include/msvcrt/eh.h,v
retrieving revision 1.5
diff -u -r1.5 eh.h
--- ./include/msvcrt/eh.h 18 Dec 2002 20:17:20 -0000 1.5
+++ ./include/msvcrt/eh.h 3 Jan 2003 20:57:04 -0000
@@ -21,7 +21,7 @@
#define __WINE_EH_H
#define __WINE_USE_MSVCRT
-#if !defined(__cplusplus) && !defined(__WINE__)
+#if !defined(__cplusplus) && !defined(__WINESRC__)
#error "eh.h is meant only for C++ applications"
#endif
Index: ./include/msvcrt/stdio.h
===================================================================
RCS file: /var/cvs/wine/include/msvcrt/stdio.h,v
retrieving revision 1.8
diff -u -r1.8 stdio.h
--- ./include/msvcrt/stdio.h 18 Dec 2002 20:17:20 -0000 1.8
+++ ./include/msvcrt/stdio.h 3 Jan 2003 20:57:04 -0000
@@ -140,11 +140,11 @@
#define stdin (_iob+STDIN_FILENO)
#define stdout (_iob+STDOUT_FILENO)
#define stderr (_iob+STDERR_FILENO)
-#elif !defined(__WINE__)
+#elif !defined(__WINESRC__)
#define MSVCRT_stdin (_iob+STDIN_FILENO)
#define MSVCRT_stdout (_iob+STDOUT_FILENO)
#define MSVCRT_stderr (_iob+STDERR_FILENO)
-#endif /* USE_MSVCRT_PREFIX, __WINE__ */
+#endif /* USE_MSVCRT_PREFIX, __WINESRC__ */
#ifndef MSVCRT_STDIO_DEFINED
#define MSVCRT_STDIO_DEFINED
Index: ./include/msvcrt/stdlib.h
===================================================================
RCS file: /var/cvs/wine/include/msvcrt/stdlib.h,v
retrieving revision 1.9
diff -u -r1.9 stdlib.h
--- ./include/msvcrt/stdlib.h 3 Jan 2003 03:07:06 -0000 1.9
+++ ./include/msvcrt/stdlib.h 3 Jan 2003 20:57:04 -0000
@@ -118,7 +118,7 @@
#define __mb_cur_max (*__p___mb_cur_max())
#define _doserrno (*__doserrno())
#define _fmode (*_fmode)
-#elif !defined(__WINE__)
+#elif !defined(__WINESRC__)
#define MSVCRT___argc (*__p___argc())
#define MSVCRT___argv (*__p___argv())
#define MSVCRT___wargv (*__p___wargv())
@@ -127,7 +127,7 @@
#define MSVCRT___mb_cur_max (*__p___mb_cur_max())
#define MSVCRT__doserrno (*__doserrno())
#define MSVCRT__fmode (*_fmode())
-#endif /* USE_MSVCRT_PREFIX, __WINE__ */
+#endif /* USE_MSVCRT_PREFIX, __WINESRC__ */
extern int* MSVCRT(_errno)(void);
Index: ./include/wine/debug.h
===================================================================
RCS file: /var/cvs/wine/include/wine/debug.h,v
retrieving revision 1.6
diff -u -r1.6 debug.h
--- ./include/wine/debug.h 3 Jan 2003 03:12:58 -0000 1.6
+++ ./include/wine/debug.h 3 Jan 2003 20:57:04 -0000
@@ -174,7 +174,7 @@
#define WINE_DPRINTF wine_dbg_printf
#define WINE_MESSAGE wine_dbg_printf
-#ifdef __WINE__
+#ifdef __WINESRC__
/* Wine uses shorter names that are very likely to conflict with other software */
inline static const char *debugstr_an( const char * s, int n ) { return wine_dbgstr_an( s, n ); }
@@ -203,7 +203,7 @@
#define DPRINTF WINE_DPRINTF
#define MESSAGE WINE_MESSAGE
-#endif /* __WINE__ */
+#endif /* __WINESRC__ */
#ifdef __cplusplus
}
Index: ./include/wine/exception.h
===================================================================
RCS file: /var/cvs/wine/include/wine/exception.h,v
retrieving revision 1.21
diff -u -r1.21 exception.h
--- ./include/wine/exception.h 10 Dec 2002 22:56:44 -0000 1.21
+++ ./include/wine/exception.h 3 Jan 2003 20:57:04 -0000
@@ -192,7 +192,7 @@
extern void __wine_enter_vm86( CONTEXT *context );
-#ifdef __WINE__
+#ifdef __WINESRC__
extern void WINAPI EXC_RtlRaiseException( PEXCEPTION_RECORD, PCONTEXT );
#endif
Index: ./include/wine/obj_control.h
===================================================================
RCS file: /var/cvs/wine/include/wine/obj_control.h,v
retrieving revision 1.13
diff -u -r1.13 obj_control.h
--- ./include/wine/obj_control.h 31 May 2002 23:06:50 -0000 1.13
+++ ./include/wine/obj_control.h 3 Jan 2003 20:57:05 -0000
@@ -424,7 +424,7 @@
/*****************************************************************************
* IProvideClassInfo interface
*/
-#ifdef __WINE__
+#ifdef __WINESRC__
#undef GetClassInfo
#endif
Index: ./include/wine/obj_inplace.h
===================================================================
RCS file: /var/cvs/wine/include/wine/obj_inplace.h,v
retrieving revision 1.18
diff -u -r1.18 obj_inplace.h
--- ./include/wine/obj_inplace.h 31 May 2002 23:06:50 -0000 1.18
+++ ./include/wine/obj_inplace.h 3 Jan 2003 20:57:05 -0000
@@ -425,7 +425,7 @@
/*****************************************************************************
* IOleItemContainer interface
*/
-#ifdef __WINE__
+#ifdef __WINESRC__
#undef GetObject
#endif
Index: ./server/Makefile.in
===================================================================
RCS file: /var/cvs/wine/server/Makefile.in,v
retrieving revision 1.37
diff -u -r1.37 Makefile.in
--- ./server/Makefile.in 29 Oct 2002 00:41:42 -0000 1.37
+++ ./server/Makefile.in 3 Jan 2003 20:59:18 -0000
@@ -1,4 +1,4 @@
-DEFS = -D__WINE__
+DEFS = -D__WINESRC__
TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ..
SRCDIR = @srcdir@
Index: ./tools/winebuild/Makefile.in
===================================================================
RCS file: /var/cvs/wine/tools/winebuild/Makefile.in,v
retrieving revision 1.12
diff -u -r1.12 Makefile.in
--- ./tools/winebuild/Makefile.in 28 Jul 2002 18:58:41 -0000 1.12
+++ ./tools/winebuild/Makefile.in 3 Jan 2003 20:59:18 -0000
@@ -1,4 +1,4 @@
-DEFS = -D__WINE__
+DEFS = -D__WINESRC__
TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
Index: ./tools/winedump/Makefile.in
===================================================================
RCS file: /var/cvs/wine/tools/winedump/Makefile.in,v
retrieving revision 1.4
diff -u -r1.4 Makefile.in
--- ./tools/winedump/Makefile.in 2 Oct 2002 18:50:09 -0000 1.4
+++ ./tools/winedump/Makefile.in 3 Jan 2003 20:59:18 -0000
@@ -1,4 +1,4 @@
-DEFS = -D__WINE__
+DEFS = -D__WINESRC__
TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
Index: ./tools/wmc/Makefile.in
===================================================================
RCS file: /var/cvs/wine/tools/wmc/Makefile.in,v
retrieving revision 1.13
diff -u -r1.13 Makefile.in
--- ./tools/wmc/Makefile.in 15 Dec 2002 01:19:53 -0000 1.13
+++ ./tools/wmc/Makefile.in 3 Jan 2003 20:59:18 -0000
@@ -1,4 +1,4 @@
-DEFS = -D__WINE__
+DEFS = -D__WINESRC__
TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
Index: ./tools/wrc/Makefile.in
===================================================================
RCS file: /var/cvs/wine/tools/wrc/Makefile.in,v
retrieving revision 1.23
diff -u -r1.23 Makefile.in
--- ./tools/wrc/Makefile.in 15 Dec 2002 01:19:53 -0000 1.23
+++ ./tools/wrc/Makefile.in 3 Jan 2003 20:59:18 -0000
@@ -1,4 +1,4 @@
-DEFS = -D__WINE__ -DINCLUDEDIR="\"$(includedir)\""
+DEFS = -D__WINESRC__ -DINCLUDEDIR="\"$(includedir)\""
TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
Index: ./tools/widl/Makefile.in
===================================================================
RCS file: /var/cvs/wine/tools/widl/Makefile.in,v
retrieving revision 1.4
diff -u -r1.4 Makefile.in
--- ./tools/widl/Makefile.in 15 Dec 2002 01:19:53 -0000 1.4
+++ ./tools/widl/Makefile.in 3 Jan 2003 20:59:18 -0000
@@ -1,4 +1,4 @@
-DEFS = -D__WINE__
+DEFS = -D__WINESRC__
TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
Index: ./tools/wpp/Makefile.in
===================================================================
RCS file: /var/cvs/wine/tools/wpp/Makefile.in,v
retrieving revision 1.3
diff -u -r1.3 Makefile.in
--- ./tools/wpp/Makefile.in 15 Dec 2002 01:19:53 -0000 1.3
+++ ./tools/wpp/Makefile.in 3 Jan 2003 20:59:18 -0000
@@ -1,4 +1,4 @@
-DEFS = -D__WINE__
+DEFS = -D__WINESRC__
TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
Index: Make.rules.in
===================================================================
RCS file: /var/cvs/wine/Make.rules.in,v
retrieving revision 1.137
diff -u -r1.137 Make.rules.in
--- Make.rules.in 19 Dec 2002 23:43:02 -0000 1.137
+++ Make.rules.in 3 Jan 2003 20:59:13 -0000
@@ -171,13 +171,13 @@
cd `dirname $@` && $(MAKE) man
man: $(C_SRCS) $(SUBDIRS:%=%/__man__)
- if [ -n "$(C_SRCS)" ]; then $(MKINSTALLDIRS) $(TOPOBJDIR)/documentation/man3w; for i in $(C_SRCS); do $(C2MAN) -L -o $(TOPOBJDIR)/documentation/man3w -S3w $(DIVINCL) -D__WINE__ $(MANSPECS) $$i; done; fi
+ if [ -n "$(C_SRCS)" ]; then $(MKINSTALLDIRS) $(TOPOBJDIR)/documentation/man3w; for i in $(C_SRCS); do $(C2MAN) -L -o $(TOPOBJDIR)/documentation/man3w -S3w $(DIVINCL) -D__WINESRC__ $(MANSPECS) $$i; done; fi
$(SUBDIRS:%=%/__doc_html__): dummy
cd `dirname $@` && $(MAKE) doc-html
doc-html: $(C_SRCS) $(SUBDIRS:%=%/__doc_html__)
- if [ -n "$(C_SRCS)" ]; then $(MKINSTALLDIRS) $(TOPOBJDIR)/documentation/html; for i in $(C_SRCS); do $(C2MAN) -L -o $(TOPOBJDIR)/documentation/html -Th -iwindows.h $(DIVINCL) -D__WINE__ $(MANSPECS) $$i; done; fi
+ if [ -n "$(C_SRCS)" ]; then $(MKINSTALLDIRS) $(TOPOBJDIR)/documentation/html; for i in $(C_SRCS); do $(C2MAN) -L -o $(TOPOBJDIR)/documentation/html -Th -iwindows.h $(DIVINCL) -D__WINESRC__ $(MANSPECS) $$i; done; fi
.PHONY: man doc-html $(SUBDIRS:%=%/__man__) $(SUBDIRS:%=%/__doc_html__)
Index: ./dlls/Makedll.rules.in
===================================================================
RCS file: /var/cvs/wine/dlls/Makedll.rules.in,v
retrieving revision 1.45
diff -u -r1.45 Makedll.rules.in
--- ./dlls/Makedll.rules.in 13 Dec 2002 20:45:39 -0000 1.45
+++ ./dlls/Makedll.rules.in 3 Jan 2003 20:59:13 -0000
@@ -8,7 +8,7 @@
# plus all variables required by the global Make.rules.in
#
-DEFS = @DLLFLAGS@ -D__WINE__ $(EXTRADEFS)
+DEFS = @DLLFLAGS@ -D__WINESRC__ $(EXTRADEFS)
DLLEXT = @DLLEXT@
ALTSPECS = $(ALTNAMES:%.dll=%)
SPEC_SRCS = $(ALTSPECS:%=%.spec)
Index: ./library/Makefile.in
===================================================================
RCS file: /var/cvs/wine/library/Makefile.in,v
retrieving revision 1.17
diff -u -r1.17 Makefile.in
--- ./library/Makefile.in 19 Dec 2002 23:43:02 -0000 1.17
+++ ./library/Makefile.in 3 Jan 2003 20:59:17 -0000
@@ -1,4 +1,4 @@
-DEFS = @DLLFLAGS@ -D__WINE__ -DDLLDIR="\"$(dlldir)\""
+DEFS = @DLLFLAGS@ -D__WINESRC__ -DDLLDIR="\"$(dlldir)\""
TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ..
SRCDIR = @srcdir@
Index: ./miscemu/Makefile.in
===================================================================
RCS file: /var/cvs/wine/miscemu/Makefile.in,v
retrieving revision 1.11
diff -u -r1.11 Makefile.in
--- ./miscemu/Makefile.in 6 Nov 2002 20:02:59 -0000 1.11
+++ ./miscemu/Makefile.in 3 Jan 2003 20:59:17 -0000
@@ -1,4 +1,4 @@
-DEFS = -D__WINE__
+DEFS = -D__WINESRC__
TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ..
SRCDIR = @srcdir@
Index: ./ole/Makefile.in
===================================================================
RCS file: /var/cvs/wine/ole/Makefile.in,v
retrieving revision 1.27
diff -u -r1.27 Makefile.in
--- ./ole/Makefile.in 17 Dec 2002 01:16:07 -0000 1.27
+++ ./ole/Makefile.in 3 Jan 2003 20:59:17 -0000
@@ -1,4 +1,4 @@
-DEFS = @DLLFLAGS@ -D__WINE__
+DEFS = @DLLFLAGS@ -D__WINESRC__
TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ..
SRCDIR = @srcdir@
Index: ./tools/winapi/Makefile.in
===================================================================
RCS file: /var/cvs/wine/tools/winapi/Makefile.in,v
retrieving revision 1.5
diff -u -r1.5 Makefile.in
--- ./tools/winapi/Makefile.in 1 Oct 2002 18:10:54 -0000 1.5
+++ ./tools/winapi/Makefile.in 3 Jan 2003 20:59:18 -0000
@@ -1,4 +1,4 @@
-DEFS = -D__WINE__
+DEFS = -D__WINESRC__
TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
Index: ./unicode/Makefile.in
===================================================================
RCS file: /var/cvs/wine/unicode/Makefile.in,v
retrieving revision 1.17
diff -u -r1.17 Makefile.in
--- ./unicode/Makefile.in 19 Dec 2002 23:43:02 -0000 1.17
+++ ./unicode/Makefile.in 3 Jan 2003 20:59:18 -0000
@@ -1,4 +1,4 @@
-DEFS = @DLLFLAGS@ -D__WINE__
+DEFS = @DLLFLAGS@ -D__WINESRC__
TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ..
SRCDIR = @srcdir@
Index: ./tools/winapi/msvcmaker
===================================================================
RCS file: /var/cvs/wine/tools/winapi/msvcmaker,v
retrieving revision 1.9
diff -u -r1.9 msvcmaker
--- ./tools/winapi/msvcmaker 18 Dec 2002 02:22:12 -0000 1.9
+++ ./tools/winapi/msvcmaker 3 Jan 2003 21:33:53 -0000
@@ -673,7 +673,7 @@
my @includes = ();
if($wine) {
push @defines2, "_\U${project}\E_";
- push @defines2, qw(__WINE__) if $project !~ /^(?:wine(?:build|test)|.*?_test)$/;
+ push @defines2, qw(__WINESRC__) if $project !~ /^(?:wine(?:build|test)|.*?_test)$/;
push @defines2, qw(__WINE_USE_MSVCRT);
my $output_dir2 = $output_dir;
$output_dir =~ s/\\/\\\\/g;
--
Dimi.
