Changeset 5344 for trunk/src

Timestamp:

Mar 21, 2001, 12:18:56 AM (24 years ago)

Author:

mike

Message:

Cleaned up DDRAW for Watcom

Location:

trunk/src/ddraw

Files:

• OS2UTIL.CPP (modified) (2 diffs)
• cio2.h (modified) (1 diff)
• ddraw.CPP (modified) (4 diffs)
• os2fsdd.h (modified) (2 diffs)
• rectangle.cpp (modified) (2 diffs)
• rectangle.h (modified) (2 diffs)

trunk/src/ddraw/OS2UTIL.CPP

@@ -1 @@
-/* $Id: OS2UTIL.CPP,v 1.10 2001-01-02 18:21:39 sandervl Exp $ */
+/* $Id: OS2UTIL.CPP,v 1.11 2001-03-20 23:18:55 mike Exp $ */
 
 /*
@@ -49 +49 @@
 //******************************************************************************
 
+extern "C" {
 BOOL    APIENTRY _GpiEnableYInversion (HPS hps, LONG lHeight);
+}
 
 void InverseDC(HDC hdc, LONG lHeight)

trunk/src/ddraw/cio2.h

@@ -10 +10 @@
 extern "C"
 {
- int io_init1();
- int io_init2(short);
- int io_exit1();
+ int _System io_init1();
+ int _System io_init2(short);
+ int _System _io_exit1();
 
- char c_inb1(short);
- short c_inw1(short);
- long c_inl1(short);
- void c_outb1(short,char);
- void c_outw1(short,short);
- void c_outl1(short,long);
+ char _System c_inb1(short);
+ short _System c_inw1(short);
+ long _System c_inl1(short);
+ void _System c_outb1(short,char);
+ void _System c_outw1(short,short);
+ void _System c_outl1(short,long);
  int psw();
 }

trunk/src/ddraw/ddraw.CPP

@@ -1 @@
-/* $Id: ddraw.CPP,v 1.17 2001-03-18 21:44:44 mike Exp $ */
+/* $Id: ddraw.CPP,v 1.18 2001-03-20 23:18:55 mike Exp $ */
 
 /*
@@ -28 +28 @@
 #include <misc.h>
 
+extern "C" {
+
 //******************************************************************************
 //******************************************************************************
@@ -71 +73 @@
 
 //******************************************************************************
-typedef BOOL (FAR PASCAL * LPDDENUMCALLBACKA)(GUID FAR *, LPSTR, LPSTR, LPVOID);
+//typedef BOOL (FAR PASCAL * LPDDENUMCALLBACKA)(GUID FAR *, LPSTR, LPSTR, LPVOID);
 //******************************************************************************
 HRESULT WIN32API OS2DirectDrawEnumerateA(LPDDENUMCALLBACKA lpCallback,
@@ -285 +287 @@
 }//******************************************************************************
 
+}

trunk/src/ddraw/os2fsdd.h

@@ -11 +11 @@
 #ifndef __OS2FSDD__
 #define __OS2FSDD__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 ULONG APIENTRY Gre32Entry3(ULONG,ULONG,ULONG);
@@ -43 +47 @@
 #define GreResurrection(a,b,c) (BOOL) _Gre32Entry5((HDC)(a),(LONG)(b),(c),0L,NGreResurrection)
 
+
+#ifdef __cplusplus
+}
+#endif
+
 ULONG SetSVGAMode (ULONG     ulHorRes,
                    ULONG     ulVerRes,

trunk/src/ddraw/rectangle.cpp

@@ -1 @@
-/* $Id: rectangle.cpp,v 1.4 2001-03-18 21:44:46 mike Exp $ */
+/* $Id: rectangle.cpp,v 1.5 2001-03-20 23:18:56 mike Exp $ */
 
 /*
@@ -10 +10 @@
  */
 
-typedef long BOOL;
+typedef unsigned long BOOL;
 
 #include "rectangle.h"

trunk/src/ddraw/rectangle.h

@@ -1 @@
-/* $Id: rectangle.h,v 1.5 2001-03-18 21:44:46 mike Exp $ */
+/* $Id: rectangle.h,v 1.6 2001-03-20 23:18:56 mike Exp $ */
 
 /*
@@ -30 +30 @@
 /*------------------------------- Comparisons --------------------------------*/
 BOOL
-  operator == ( const DDRectangle& rectangle ) const,
-  operator != ( const DDRectangle& rectangle ) const;
+  operator == ( const DDRectangle &rectangle ) const,
+  operator != ( const DDRectangle &rectangle ) const;
 
 /*--------------------------------- Testing ----------------------------------*/