# HG changeset patch
# User alex
# Date 1044188855 0
# Node ID 4a5b01c405b6363568c34ded07bd41d0681689d5
# Parent  7c12f4501ed6f533dc68d7ef1a674c6d2d9cdb75
compiler warning fixes by Domink and some other changes by me

diff -r 7c12f4501ed6 -r 4a5b01c405b6 libdha/libdha.c
--- a/libdha/libdha.c	Sun Feb 02 11:46:57 2003 +0000
+++ b/libdha/libdha.c	Sun Feb 02 12:27:35 2003 +0000
@@ -88,7 +88,9 @@
 #endif
 
 #ifdef CONFIG_DHAHELPER
+#ifdef CONFIG_SVGAHELPER
 dha_helper_way:
+#endif
   if ( (mem_fd = open("/dev/dhahelper",O_RDWR)) < 0)
   {
       perror("libdha: DHA kernelhelper failed");
@@ -118,22 +120,22 @@
   if ( (mem_fd = open(DEV_MEM,O_RDWR)) == -1)
   {
     perror("libdha: opening /dev/mem failed");
-    return -1;
+    return MAP_FAILED;
   }
 
 mmap:
   return mmap(0,size,PROT_READ|PROT_WRITE,MAP_SHARED,mem_fd,base);
 }
-#endif /* CONFIG_DHAHELPER */
+#endif /* Generic mmap (not win32, nor os2) */
 
 void unmap_phys_mem(void *ptr, unsigned long size)
 {
   int res = munmap(ptr,size);
 
-  if (res == -1)
+  if (res == (int)MAP_FAILED)
   {
       perror("libdha: unmapping memory failed");
-      return -1;
+      return;
   }
   
   close(mem_fd);