diff -U4 -r NVIDIA-Linux-x86-1.0-7174-pkg0/usr/src/nv/nv.c NVIDIA-Linux-x86-1.0-7174-pkg0+byte/usr/src/nv/nv.c
--- NVIDIA-Linux-x86-1.0-7174-pkg0/usr/src/nv/nv.c	2005-03-22 15:36:23.000000000 +0000
+++ NVIDIA-Linux-x86-1.0-7174-pkg0+byte/usr/src/nv/nv.c	2006-06-24 00:09:27.000000000 +0100
@@ -219,9 +219,9 @@
 
 // pull in the pointer to the NVID stamp from the binary module
 extern const char *pNVRM_ID;
 
-#if NV_ENABLE_MEM_TRACKING
+#ifdef NV_ENABLE_MEM_TRACKING
 // poor man's memory tracker, see nv-linux.h
 int vm_usage = 0;
 int km_usage = 0;
 int fp_usage = 0;
@@ -1163,9 +1163,9 @@
         __nv_disable_pat_support();
     }
 #endif
 
-#if NV_ENABLE_MEM_TRACKING
+#ifdef NV_ENABLE_MEM_TRACKING
     nv_list_mem(vm_list);
     nv_list_mem(km_list);
     nv_list_mem(fp_list);
     nv_printf(NV_DBG_ERRORS, "NVRM: final mem usage: vm 0x%x km 0x%x fp 0x%x\n",
diff -U4 -r NVIDIA-Linux-x86-1.0-7174-pkg0/usr/src/nv/nv-linux.h NVIDIA-Linux-x86-1.0-7174-pkg0+byte/usr/src/nv/nv-linux.h
--- NVIDIA-Linux-x86-1.0-7174-pkg0/usr/src/nv/nv-linux.h	2005-03-22 15:36:23.000000000 +0000
+++ NVIDIA-Linux-x86-1.0-7174-pkg0+byte/usr/src/nv/nv-linux.h	2006-06-24 00:02:00.000000000 +0100
@@ -237,9 +237,9 @@
 #ifdef DEBUG
 #define NV_ENABLE_MEM_TRACKING 1
 #endif
 
-#if NV_ENABLE_MEM_TRACKING
+#ifdef NV_ENABLE_MEM_TRACKING
 #define NV_MEM_TRACKING_PAD_SIZE(size)   ((size) += sizeof(void *))
 #define NV_MEM_TRACKING_HIDE_SIZE(ptr, size)            \
     if ((ptr) && *(ptr)) {                              \
         U008 *__ptr;                                    \
@@ -265,9 +265,9 @@
  * when memory usage gets out of control or if memory leaks are happening
  */
 
 /* keep track of memory usage */
-#if NV_ENABLE_MEM_TRACKING
+#ifdef NV_ENABLE_MEM_TRACKING
 extern int vm_usage;
 extern int km_usage;
 extern int fp_usage;
 
diff -U4 -r NVIDIA-Linux-x86-1.0-7174-pkg0/usr/src/nv/os-interface.c NVIDIA-Linux-x86-1.0-7174-pkg0+byte/usr/src/nv/os-interface.c
--- NVIDIA-Linux-x86-1.0-7174-pkg0/usr/src/nv/os-interface.c	2005-03-22 15:36:23.000000000 +0000
+++ NVIDIA-Linux-x86-1.0-7174-pkg0+byte/usr/src/nv/os-interface.c	2006-06-24 00:03:02.000000000 +0100
@@ -663,9 +663,9 @@
 // this is what actually outputs the data.
 //
 inline void NV_API_CALL out_string(const char *str)
 {
-#if DEBUG
+#ifdef DEBUG
     static int was_newline = 0;
 
     if (NV_NUM_CPUS() > 1 && was_newline)
     {
@@ -675,9 +675,9 @@
     else
 #endif
         printk("%s", str);
 
-#if DEBUG
+#ifdef DEBUG
     if (NV_NUM_CPUS() > 1)
     {
         int len, i;