XLibre/xserver
1
1
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-04-14 17:18:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

os: Remove deprecated malloc/free wrappers

Browse Source 
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
Adam Jackson
2014-07-08 13:24:25 -04:00
parent d5b2799772
commit cad9b053d5
3 changed files with 3 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
include/os.h
View File

@@ -67,15 +67,11 @@ SOFTWARE.
typedef struct _FontPathRec *FontPathPtr;
typedef struct _NewClientRec *NewClientPtr;
#ifndef xalloc
#ifndef xnfalloc
#define xnfalloc(size) XNFalloc((unsigned long)(size))
#define xnfcalloc(_num, _size) XNFcalloc((unsigned long)(_num)*(unsigned long)(_size))
#define xnfrealloc(ptr, size) XNFrealloc((void *)(ptr), (unsigned long)(size))
#define xalloc(size) Xalloc((unsigned long)(size))
#define xcalloc(_num, _size) Xcalloc((unsigned long)(_num)*(unsigned long)(_size))
#define xrealloc(ptr, size) Xrealloc((void *)(ptr), (unsigned long)(size))
#define xfree(ptr) Xfree((void *)(ptr))
#define xstrdup(s) Xstrdup(s)
#define xnfstrdup(s) XNFstrdup(s)
#endif
@@ -214,37 +210,6 @@ extern _X_EXPORT int set_font_authorizations(char **authorizations,
int *authlen,
void *client);
#ifndef _HAVE_XALLOC_DECLS
#define _HAVE_XALLOC_DECLS
/*
* Use malloc(3) instead.
*/
extern _X_EXPORT void *
Xalloc(unsigned long /*amount */ ) _X_DEPRECATED;
/*
* Use calloc(3) instead
*/
extern _X_EXPORT void *
Xcalloc(unsigned long /*amount */ ) _X_DEPRECATED;
/*
* Use realloc(3) instead
*/
extern _X_EXPORT void *
Xrealloc(void * /*ptr */ , unsigned long /*amount */ )
_X_DEPRECATED;
/*
* Use free(3) instead
*/
extern _X_EXPORT void
Xfree(void * /*ptr */ )
_X_DEPRECATED;
#endif
/*
* This function malloc(3)s buffer, terminating the server if there is not
* enough memory.