comparison loader/wine/winnt.h @ 23430:251338cf2f58

Get rid of superfluous __WINE__ #define, it was always enabled and cluttered the code. Blessed by Reimar.
author diego
date Sat, 02 Jun 2007 12:27:33 +0000
parents bdc49c9c419e
children c98c9e7f3bd0
comparison
equal deleted inserted replaced
23429:450bb2a75cba 23430:251338cf2f58
79 79
80 /* TCHAR data types definitions for Winelib. */ 80 /* TCHAR data types definitions for Winelib. */
81 /* These types are _not_ defined for the emulator, because they */ 81 /* These types are _not_ defined for the emulator, because they */
82 /* depend on the UNICODE macro that only exists in user's code. */ 82 /* depend on the UNICODE macro that only exists in user's code. */
83 83
84 //#ifndef __WINE__
85 # ifdef UNICODE 84 # ifdef UNICODE
86 typedef WCHAR TCHAR, *PTCHAR; 85 typedef WCHAR TCHAR, *PTCHAR;
87 typedef LPWSTR PTSTR, LPTSTR; 86 typedef LPWSTR PTSTR, LPTSTR;
88 typedef LPCWSTR PCTSTR, LPCTSTR; 87 typedef LPCWSTR PCTSTR, LPCTSTR;
89 #define __TEXT(string) L##string /*probably wrong */ 88 #define __TEXT(string) L##string /*probably wrong */
91 typedef char TCHAR, *PTCHAR; 90 typedef char TCHAR, *PTCHAR;
92 typedef LPSTR PTSTR, LPTSTR; 91 typedef LPSTR PTSTR, LPTSTR;
93 typedef LPCSTR PCTSTR, LPCTSTR; 92 typedef LPCSTR PCTSTR, LPCTSTR;
94 #define __TEXT(string) string 93 #define __TEXT(string) string
95 # endif /* UNICODE */ 94 # endif /* UNICODE */
96 //#endif /* __WINE__ */
97 #define TEXT(quote) __TEXT(quote) 95 #define TEXT(quote) __TEXT(quote)
98 96
99 typedef BYTE BOOLEAN; 97 typedef BYTE BOOLEAN;
100 typedef BOOLEAN *PBOOLEAN; 98 typedef BOOLEAN *PBOOLEAN;
101 99
627 #endif 625 #endif
628 626
629 typedef CONTEXT *PCONTEXT; 627 typedef CONTEXT *PCONTEXT;
630 typedef HANDLE *PHANDLE; 628 typedef HANDLE *PHANDLE;
631 629
632 #ifdef __WINE__
633
634 /* Macros for easier access to i386 context registers */ 630 /* Macros for easier access to i386 context registers */
635 631
636 #define EAX_reg(context) ((context)->Eax) 632 #define EAX_reg(context) ((context)->Eax)
637 #define EBX_reg(context) ((context)->Ebx) 633 #define EBX_reg(context) ((context)->Ebx)
638 #define ECX_reg(context) ((context)->Ecx) 634 #define ECX_reg(context) ((context)->Ecx)
763 #endif 759 #endif
764 760
765 #if !defined(GET_IP) && !defined(RC_INVOKED) 761 #if !defined(GET_IP) && !defined(RC_INVOKED)
766 # error You must define GET_IP for this CPU 762 # error You must define GET_IP for this CPU
767 #endif 763 #endif
768
769 #endif /* __WINE__ */
770 764
771 /* 765 /*
772 * Exception codes 766 * Exception codes
773 */ 767 */
774 768