diff options
| author | Keith Packard <keithp@keithp.com> | 2015-06-22 09:36:08 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-12-28 12:54:40 +0100 |
| commit | 68dd0b52e13c844d662192654fb10cb993257a59 (patch) | |
| tree | a97ab98a06147cd5fb194063a9984dc3973fba55 /nx-X11/programs/Xserver/hw/xfree86 | |
| parent | e9f44221b2520a1d894b3c125269b5d10438453b (diff) | |
| download | nx-libs-68dd0b52e13c844d662192654fb10cb993257a59.tar.gz nx-libs-68dd0b52e13c844d662192654fb10cb993257a59.tar.bz2 nx-libs-68dd0b52e13c844d662192654fb10cb993257a59.zip | |
Replace 'pointer' type with 'void *'
This lets us stop using the 'pointer' typedef in Xdefs.h as 'pointer'
is used throughout the X server for other things, and having duplicate
names generates compiler warnings.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Rebased against NX: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Diffstat (limited to 'nx-X11/programs/Xserver/hw/xfree86')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/xfree86/os-support/xf86_ansic.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nx-X11/programs/Xserver/hw/xfree86/os-support/xf86_ansic.h b/nx-X11/programs/Xserver/hw/xfree86/os-support/xf86_ansic.h index c4090dc16..1322e72ee 100644 --- a/nx-X11/programs/Xserver/hw/xfree86/os-support/xf86_ansic.h +++ b/nx-X11/programs/Xserver/hw/xfree86/os-support/xf86_ansic.h @@ -268,7 +268,7 @@ extern int xf86vsnprintf(char*,xf86size_t,const char*,va_list); extern int xf86open(const char*, int,...); extern int xf86close(int); extern long xf86lseek(int, long, int); -extern int xf86ioctl(int, unsigned long, pointer); +extern int xf86ioctl(int, unsigned long, void *); extern xf86ssize_t xf86read(int, void *, xf86size_t); extern xf86ssize_t xf86write(int, const void *, xf86size_t); extern void* xf86mmap(void*, xf86size_t, int, int, int, xf86size_t /* off_t */); @@ -306,7 +306,7 @@ unsigned int xf86sleep(unsigned int seconds); extern int xf86shmget(xf86key_t key, int size, int xf86shmflg); extern char * xf86shmat(int id, char *addr, int xf86shmflg); extern int xf86shmdt(char *addr); -extern int xf86shmctl(int id, int xf86cmd, pointer buf); +extern int xf86shmctl(int id, int xf86cmd, void * buf); extern int xf86setjmp(xf86jmp_buf env); extern int xf86setjmp0(xf86jmp_buf env); |