Changeset 21824 for branches/gcc-kmk/src/gdi32

Timestamp:

Nov 25, 2011, 10:19:52 PM (14 years ago)

Author:

dmik

Message:

Make the debug version of ported DLLs build.

Location:

branches/gcc-kmk/src/gdi32

Files:

• dbglocal.cpp (modified) (1 diff)
• dbgwrap.cpp (modified) (1 diff)
• devcontext.cpp (modified) (1 diff)
• gdi32.cpp (modified) (2 diffs)
• initterm.cpp (modified) (1 diff)
• objhandle.cpp (modified) (3 diffs)

branches/gcc-kmk/src/gdi32/dbglocal.cpp

@@ -20 +20 @@
 USHORT DbgEnabledLvl2GDI32[DBG_MAXFILES] = {0};
 
-static char  *DbgFileNames[DBG_MAXFILES] =
+static const char *DbgFileNames[DBG_MAXFILES] =
 {
 "gdi32",

branches/gcc-kmk/src/gdi32/dbgwrap.cpp

@@ -16 +16 @@
 
 #define DBG_LOCALLOG    DBG_trace
-#include <dbglocal.h>
+#include "dbglocal.h"
 
 #define DBGWRAP_MODULE "GDI32"

branches/gcc-kmk/src/gdi32/devcontext.cpp

@@ -446 +446 @@
         dprintf(("devmode.dmDriverExtra %x", lpInitData->dmDriverExtra));
         dprintf(("devmode.dmFields %x", lpInitData->dmFields));
-#if (__IBMCPP__ == 360)
+#if defined (__GNUC__) || (__IBMCPP__ == 360)
         dprintf(("devmode.dmOrientation %x", lpInitData->dmOrientation));
         dprintf(("devmode.dmPaperSize %x", lpInitData->dmPaperSize));

branches/gcc-kmk/src/gdi32/gdi32.cpp

@@ -391 +391 @@
 VOID dumpROP2(INT rop2)
 {
-  CHAR *name;
+  const char *name;
 
   switch (rop2)
@@ -549 +549 @@
 //******************************************************************************
 //******************************************************************************
-char *GetDeviceCapsString(int nIndex)
+const char *GetDeviceCapsString(int nIndex)
 {
     switch(nIndex) {

branches/gcc-kmk/src/gdi32/initterm.cpp

@@ -91 +91 @@
         return 0UL;
 
-    dprintf(("gdi32 init %s %s (%x)", __DATE__, __TIME__, inittermGdi32));
+    dprintf(("gdi32 init %s %s (%x)", __DATE__, __TIME__, DLL_InitGdi32));
 
     RasEntry (RAS_EVENT_Gdi32InitComplete, &dllHandle, sizeof (dllHandle));

branches/gcc-kmk/src/gdi32/objhandle.cpp

@@ -313 +313 @@
 //******************************************************************************
 #ifdef DEBUG
-void dumpObjectType(char *szType, DWORD dwType)
+void dumpObjectType(const char *szType, DWORD dwType)
 {
     for(int i=0;i<MAX_OBJECT_HANDLES;i++) {
@@ -445 +445 @@
 //******************************************************************************
 #ifdef DEBUG
-static char *gditypenames[] = {
+static const char *gditypenames[] = {
 "NULL",
 "OBJ_PEN",
@@ -462 +462 @@
 };
 
-char *DbgGetGDITypeName(DWORD handleType)
+const char *DbgGetGDITypeName(DWORD handleType)
 {
     if(handleType <= OBJ_ENHMETAFILE) {