Changeset 21741 for branches

Timestamp:

Oct 25, 2011, 7:06:33 PM (14 years ago)

Author:

dmik

Message:

Common compiler warnings and errors.

Location:

branches/gcc-kmk

Files:

• include/win/debugtools.h (modified) (3 diffs)
• src/kernel32/conodin32.cpp (modified) (1 diff)

branches/gcc-kmk/include/win/debugtools.h

@@ -9 +9 @@
 
 #ifndef __MISC_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 #ifdef DEBUG
@@ -52 +56 @@
 void SYSTEM DecreaseLogCount();
 void SYSTEM IncreaseLogCount();
+
+#ifdef __cplusplus
+} // extern "C"
+#endif
 
 #endif //__MISC_H__
@@ -169 +177 @@
 #  define MESSAGE WriteLog
 #else
-#  define TRACE 1 ? (void)0 : (void)((int (*)(char *, ...)) NULL)
-#  define TRACE_(ch) 1 ? (void)0 : (void)((int (*)(char *, ...)) NULL)
-#  define FIXME 1 ? (void)0 : (void)((int (*)(char *, ...)) NULL)
-#  define FIXME_(ch) 1 ? (void)0 : (void)((int (*)(char *, ...)) NULL)
-#  define WARN  1 ? (void)0 : (void)((int (*)(char *, ...)) NULL)
-#  define WARN_(ch) 1 ? (void)0 : (void)((int (*)(char *, ...)) NULL)
-#  define ERR_(ch) 1 ? (void)0 : (void)((int (*)(char *, ...)) NULL)
-#  define ERR  1 ? (void)0 : (void)((int (*)(char *, ...)) NULL)
-#  define DPRINTF   1 ? (void)0 : (void)((int (*)(char *, ...)) NULL)
-#  define MESSAGE   1 ? (void)0 : (void)((int (*)(char *, ...)) NULL)
+#  define TRACE 1 ? (void)0 : (void)((int (*)(const char *, ...)) NULL)
+#  define TRACE_(ch) 1 ? (void)0 : (void)((int (*)(const char *, ...)) NULL)
+#  define FIXME 1 ? (void)0 : (void)((int (*)(const char *, ...)) NULL)
+#  define FIXME_(ch) 1 ? (void)0 : (void)((int (*)(constchar *, ...)) NULL)
+#  define WARN  1 ? (void)0 : (void)((int (*)(const char *, ...)) NULL)
+#  define WARN_(ch) 1 ? (void)0 : (void)((int (*)(const char *, ...)) NULL)
+#  define ERR_(ch) 1 ? (void)0 : (void)((int (*)(const char *, ...)) NULL)
+#  define ERR  1 ? (void)0 : (void)((int (*)(const char *, ...)) NULL)
+#  define DPRINTF   1 ? (void)0 : (void)((int (*)(const char *, ...)) NULL)
+#  define MESSAGE   1 ? (void)0 : (void)((int (*)(const char *, ...)) NULL)
 #endif
 #undef __GET_DEBUGGING

branches/gcc-kmk/src/kernel32/conodin32.cpp

@@ -237 +237 @@
                     if (pNew)
                     {
-                        pNew->pfnHandler = pfnHandler;
+                        pNew->pfnHandler = (void *)pfnHandler;
                         pNew->pPrev = NULL;