aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/os/xalloc.c
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-12-28 13:03:52 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-12-28 13:03:52 +0100
commitedce25213ffc81389909c827c9aaac27b736b483 (patch)
treea97ab98a06147cd5fb194063a9984dc3973fba55 /nx-X11/programs/Xserver/os/xalloc.c
parente9f44221b2520a1d894b3c125269b5d10438453b (diff)
parent68dd0b52e13c844d662192654fb10cb993257a59 (diff)
downloadnx-libs-edce25213ffc81389909c827c9aaac27b736b483.tar.gz
nx-libs-edce25213ffc81389909c827c9aaac27b736b483.tar.bz2
nx-libs-edce25213ffc81389909c827c9aaac27b736b483.zip
Merge branch 'sunweaver-pr/change-pointer-into-void' into 3.6.x
Attributes GH PR #54: https://github.com/ArcticaProject/nx-libs/pull/54
Diffstat (limited to 'nx-X11/programs/Xserver/os/xalloc.c')
-rw-r--r--nx-X11/programs/Xserver/os/xalloc.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/nx-X11/programs/Xserver/os/xalloc.c b/nx-X11/programs/Xserver/os/xalloc.c
index e1cdbfc5b..a2487d4bc 100644
--- a/nx-X11/programs/Xserver/os/xalloc.c
+++ b/nx-X11/programs/Xserver/os/xalloc.c
@@ -466,10 +466,10 @@ Xalloc (unsigned long amount)
* "no failure" realloc, alternate interface to Xalloc w/o Must_have_memory
*****************/
-pointer
+void *
XNFalloc (unsigned long amount)
{
- register pointer ptr;
+ register void * ptr;
/* zero size requested */
if (amount == 0) {
@@ -499,10 +499,10 @@ XNFalloc (unsigned long amount)
* Xcalloc
*****************/
-pointer
+void *
Xcalloc (unsigned long amount)
{
- pointer ret;
+ void * ret;
ret = Xalloc (amount);
if (ret != 0
@@ -520,7 +520,7 @@ Xcalloc (unsigned long amount)
void *
XNFcalloc (unsigned long amount)
{
- pointer ret;
+ void * ret;
ret = XNFalloc (amount);
if (ret != 0
@@ -537,7 +537,7 @@ XNFcalloc (unsigned long amount)
*****************/
void *
-Xrealloc (pointer ptr, unsigned long amount)
+Xrealloc (void * ptr, unsigned long amount)
{
register unsigned long *new_ptr;
@@ -614,9 +614,9 @@ Xrealloc (pointer ptr, unsigned long amount)
*****************/
void *
-XNFrealloc (pointer ptr, unsigned long amount)
+XNFrealloc (void * ptr, unsigned long amount)
{
- if (( ptr = (pointer)Xrealloc( ptr, amount ) ) == NULL)
+ if (( ptr = (void *)Xrealloc( ptr, amount ) ) == NULL)
{
FatalError( "Out of memory" );
}
@@ -629,7 +629,7 @@ XNFrealloc (pointer ptr, unsigned long amount)
*****************/
void
-Xfree(pointer ptr)
+Xfree(void * ptr)
{
unsigned long size;
unsigned long *pheader;