diff options
| author | marha <marha@users.sourceforge.net> | 2010-03-16 09:44:59 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-03-16 09:44:59 +0000 |
| commit | 06615d6166af0efaf2893c6b7328b96c5a86b786 (patch) | |
| tree | f6771f6813846d2c7aa771f5caef11ee5e398929 /xorg-server/os | |
| parent | ed13095ef146649dce4a58c891544d7ff31915c7 (diff) | |
| parent | b958ead07bdfe03e2d697fd701bdfa82016ae5cb (diff) | |
| download | vcxsrv-06615d6166af0efaf2893c6b7328b96c5a86b786.tar.gz vcxsrv-06615d6166af0efaf2893c6b7328b96c5a86b786.tar.bz2 vcxsrv-06615d6166af0efaf2893c6b7328b96c5a86b786.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/os')
| -rw-r--r-- | xorg-server/os/utils.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/xorg-server/os/utils.c b/xorg-server/os/utils.c index ce34c9961..97a920990 100644 --- a/xorg-server/os/utils.c +++ b/xorg-server/os/utils.c @@ -1045,8 +1045,6 @@ set_font_authorizations(char **authorizations, int *authlen, pointer client) #endif /* TCPCONN */ } -#ifndef INTERNAL_MALLOC - void * Xalloc(unsigned long amount) { @@ -1162,7 +1160,6 @@ Xfree(pointer ptr) if (ptr) free(ptr); } -#endif /* !INTERNAL_MALLOC */ char * |