Changeset 12684

Timestamp:

Dec 17, 1999, 6:25:28 PM (25 years ago)

Author:

sandervl

Message:

compile fixes

Location:

tags/trunk

Files:

• include/misc.h (modified) (2 diffs)
• include/win32type.h (modified) (2 diffs)
• src/kernel32/hmdevice.cpp (modified) (2 diffs)
• src/user32/wsprintf.cpp (modified) (2 diffs)

tags/trunk/include/misc.h ¶

@@ -1 @@
-/* $Id: misc.h,v 1.12 1999-12-12 14:31:29 sandervl Exp $ */
+/* $Id: misc.h,v 1.13 1999-12-17 17:25:28 sandervl Exp $ */
 
 /*
@@ -10 +10 @@
 #define __MISC_H__
 
-#ifndef _OS2WIN_H
+#if !defined(_OS2WIN_H) && !defined(__INCLUDE_WINUSER_H) && !defined(__WINE_WINBASE_H)
   #include <win32type.h>
 #endif

tags/trunk/include/win32type.h ¶

@@ -1 @@
-/* $Id: win32type.h,v 1.29 1999-12-17 16:55:12 sandervl Exp $ */
+/* $Id: win32type.h,v 1.30 1999-12-17 17:25:28 sandervl Exp $ */
 
 /*
@@ -12 +12 @@
 
 
-#ifndef __WIN32TYPE_H__
+#if !defined(__WIN32TYPE_H__) && !defined(_OS2WIN_H) && !defined(__INCLUDE_WINUSER_H) && !defined(__WINE_WINBASE_H)
 #define __WIN32TYPE_H__
 

tags/trunk/src/kernel32/hmdevice.cpp ¶

@@ -1 @@
-/* $Id: hmdevice.cpp,v 1.12 1999-12-10 14:06:11 sandervl Exp $ */
+/* $Id: hmdevice.cpp,v 1.13 1999-12-17 17:25:10 sandervl Exp $ */
 
 /*
@@ -20 +20 @@
 #include <odin.h>
 #include <os2win.h>
-#include <win32type.h>
 #include <misc.h>
 #include "HandleManager.h"

tags/trunk/src/user32/wsprintf.cpp ¶

@@ -1 @@
-/* $Id: wsprintf.cpp,v 1.2 1999-11-22 20:33:25 sandervl Exp $ */
+/* $Id: wsprintf.cpp,v 1.3 1999-12-17 17:24:52 sandervl Exp $ */
 
 /*
@@ -19 +19 @@
 #include <odinwrap.h>
 #include <os2sel.h>
+#include <os2win.h>
 
 #include <stdarg.h>
 #include <string.h>
-#include "wine/winbase16.h"
-#include "winuser.h"
-//#include "ldt.h"
 #include "stackframe.h"
 #include "module.h"