Changeset 4164 for trunk/src/win32k/include/log.h

Timestamp:

Sep 2, 2000, 11:08:23 PM (25 years ago)

Author:

bird

Message:

Merged in the Grace branch. New Win32k!

File:

• trunk/src/win32k/include/log.h (modified) (3 diffs)

trunk/src/win32k/include/log.h

@@ -1 @@
-/* $Id: log.h,v 1.4 2000-02-25 18:15:04 bird Exp $
+/* $Id: log.h,v 1.5 2000-09-02 21:08:02 bird Exp $
  *
  * log - C-style logging - kprintf.
@@ -25 +25 @@
 #define OUTPUT_COM1 0x3f8
 #define OUTPUT_COM2 0x2f8
+#define OUTPUT_COM3 0x3e8
+#define OUTPUT_COM4 0x2e8
 
 
@@ -32 +34 @@
 #define dprintf kprintf
 #if defined(DEBUG) && !defined(NOLOGGING)
-    #ifndef INCL_16
+    #ifdef INCL_16
+        /* 16-bit */
+        #include "vprntf16.h"
+        #define kprintf(a)          printf16 a
+        #define printf this function is not used in 16-bit code! Use printf16!
+    #else
         /* 32-bit */
         #include <stdarg.h>
         #include "vprintf.h"
         #define kprintf(a)          printf a
-    #else
-        /* 16-bit */
-        #include "vprntf16.h"
-        #define kprintf(a)          printf16 a
     #endif
 #else
-    #define kprintf(a)              (void)0
+    #define kprintf(a)              ((void)0)
 #endif