Changeset 2341 for trunk/include/misc.h

Timestamp:

Jan 6, 2000, 9:03:04 PM (26 years ago)

Author:

sandervl

Message:

header updates

File:

• trunk/include/misc.h (modified) (4 diffs)

trunk/include/misc.h

@@ -1 @@
-/* $Id: misc.h,v 1.13 1999-12-17 17:25:28 sandervl Exp $ */
+/* $Id: misc.h,v 1.14 2000-01-06 20:03:03 sandervl Exp $ */
 
 /*
@@ -10 +10 @@
 #define __MISC_H__
 
-#if !defined(_OS2WIN_H) && !defined(__INCLUDE_WINUSER_H) && !defined(__WINE_WINBASE_H)
+#if !defined(_OS2WIN_H) && !defined(__INCLUDE_WINUSER_H) && !defined(__WINE_WINBASE_H) && !defined(__WINE_WINDEF_H)
   #include <win32type.h>
 #endif
@@ -69 +69 @@
 
 // necessary types
+#ifndef __WINE_WINDEF_H
 #ifdef ULONG
   #error ULONG definition is bad.
@@ -77 +78 @@
   typedef unsigned long HMODULE;
 #endif
+#endif //!__WINE_WINDEF_H
 
 #ifndef SYSTEM