From 12222f0d54d2ef58722a34ea333b1c3df7eeb0ae Mon Sep 17 00:00:00 2001
From: Eric Pouech <Eric.Pouech@wanadoo.fr>
Date: Sat, 29 Apr 2000 14:29:41 +0000
Subject: [PATCH] Fixed a few compilation warnings.

---
 dlls/x11drv/x11drv_main.c | 2 +-
 graphics/x11drv/bitmap.c  | 4 ++--
 msdos/dosaspi.c           | 2 +-
 windows/multimon.c        | 6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/dlls/x11drv/x11drv_main.c b/dlls/x11drv/x11drv_main.c
index 1316da498fa..89367d6243f 100644
--- a/dlls/x11drv/x11drv_main.c
+++ b/dlls/x11drv/x11drv_main.c
@@ -281,7 +281,7 @@ BOOL X11DRV_GetScreenSaveActive(void)
 {
     int timeout, temp;
     TSXGetScreenSaver(display, &timeout, &temp, &temp, &temp);
-    return timeout != NULL;
+    return timeout != 0;
 }
 
 /***********************************************************************
diff --git a/graphics/x11drv/bitmap.c b/graphics/x11drv/bitmap.c
index 67f3d081bed..484a7b69060 100644
--- a/graphics/x11drv/bitmap.c
+++ b/graphics/x11drv/bitmap.c
@@ -585,8 +585,8 @@ END:
  */
 Pixmap X11DRV_BITMAP_CreatePixmapFromBitmap( HBITMAP hBmp, HDC hdc )
 {
-    HGLOBAL hPackedDIB = NULL;
-    Pixmap pixmap = NULL;
+    HGLOBAL hPackedDIB = 0;
+    Pixmap pixmap = 0;
 
     /*
      * Create a packed DIB from the bitmap passed to us.
diff --git a/msdos/dosaspi.c b/msdos/dosaspi.c
index fdf12a58259..5e950e23fd9 100644
--- a/msdos/dosaspi.c
+++ b/msdos/dosaspi.c
@@ -178,7 +178,7 @@ void ASPI_DOS_HandleInt(CONTEXT86 *context)
 		if( hWNASPI32 == INVALID_HANDLE_VALUE )
 		{
 			TRACE("Loading WNASPI32\n");
-			hWNASPI32 = LoadLibraryExA("WNASPI32", NULL, 0);
+			hWNASPI32 = LoadLibraryExA("WNASPI32", 0, 0);
 		}
 
 		if( hWNASPI32 == INVALID_HANDLE_VALUE )
diff --git a/windows/multimon.c b/windows/multimon.c
index 1a4cfe4daf0..0d0fef80282 100644
--- a/windows/multimon.c
+++ b/windows/multimon.c
@@ -29,7 +29,7 @@ HMONITOR WINAPI MonitorFromPoint(POINT ptScreenCoords, DWORD dwFlags)
     {
         return xPRIMARY_MONITOR;
     }
-        return NULL;
+    return (HMONITOR)0;
 }
 
 /***********************************************************************
@@ -45,7 +45,7 @@ HMONITOR WINAPI MonitorFromRect(LPRECT lprcScreenCoords, DWORD dwFlags)
     {
         return xPRIMARY_MONITOR;
     }
-    return NULL;
+    return (HMONITOR)0;
 }
 
 /***********************************************************************
@@ -65,7 +65,7 @@ HMONITOR WINAPI MonitorFromWindow(HWND hWnd, DWORD dwFlags)
         return MonitorFromRect(&wp.rcNormalPosition, dwFlags);
     }
 
-    return NULL;
+    return (HMONITOR)0;
 }
 
 /***********************************************************************