CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bus

[matthew green]

Module Name:    xsrc
Committed By:   mrg
Date:           Tue Jan  1 00:40:01 UTC 2019

Modified Files:
        xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bus:
            netbsdSbus.c

Log Message:
s/pointer/void */ in a few places.  remove now (void *) casts.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
    xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bus/netbsdSbus.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bus/netbsdSbus.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bus/netbsdSbus.c:1.5 xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bus/netbsdSbus.c:1.6
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bus/netbsdSbus.c:1.5	Sat Aug 20 21:15:07 2016
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bus/netbsdSbus.c	Tue Jan  1 00:40:01 2019
@@ -611,10 +611,10 @@ sparcDriverName(void)
     return name;
 }
 
-pointer
+void *
 xf86MapSbusMem(sbusDevicePtr psdp, unsigned long offset, unsigned long size)
 {
-    pointer ret;
+    void * ret;
 
     if (psdp->fd == -1) {
 	psdp->fd = open(psdp->device, O_RDWR);
@@ -623,20 +623,20 @@ xf86MapSbusMem(sbusDevicePtr psdp, unsig
     } else if (psdp->fd < 0)
 	return NULL;
 
-    ret = (pointer) mmap (NULL, size, PROT_READ | PROT_WRITE, MAP_PRIVATE,
+    ret = mmap (NULL, size, PROT_READ | PROT_WRITE, MAP_PRIVATE,
 			  psdp->fd, offset);
-    if (ret == (pointer) -1) {
-	ret = (pointer) mmap (NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED,
+    if (ret == (void *) -1) {
+	ret = mmap (NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED,
 			      psdp->fd, offset);
     }
-    if (ret == (pointer) -1)
+    if (ret == (void *) -1)
 	return NULL;
 
     return ret;
 }
 
 void
-xf86UnmapSbusMem(sbusDevicePtr psdp, pointer addr, unsigned long size)
+xf86UnmapSbusMem(sbusDevicePtr psdp, void * addr, unsigned long size)
 {
     munmap (addr, size);
 }