diff options
| author | Adam Jackson <ajax@redhat.com> | 2009-01-20 23:16:35 -0500 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2009-01-20 23:16:35 -0500 |
| commit | 0cdc9b8f850342d50b72a57507db3413eacc6fb8 (patch) | |
| tree | b86480167977d28f8e7574c91aedf982db52bf32 /include/X11 | |
| parent | 632a2e90a4b209facc84d7a18873f19a720ea7df (diff) | |
xalloc -> malloc, etc.
Diffstat (limited to 'include/X11')
| -rw-r--r-- | include/X11/fonts/bufio.h | 7 | ||||
| -rw-r--r-- | include/X11/fonts/fontmisc.h | 13 |
2 files changed, 0 insertions, 20 deletions
diff --git a/include/X11/fonts/bufio.h b/include/X11/fonts/bufio.h index b5977b1..f8e5815 100644 --- a/include/X11/fonts/bufio.h +++ b/include/X11/fonts/bufio.h @@ -34,13 +34,6 @@ from The Open Group. #include <X11/Xfuncproto.h> -#ifdef TEST - -#define xalloc(s) malloc(s) -#define xfree(s) free(s) - -#endif - #define BUFFILESIZE 8192 #define BUFFILEEOF -1 diff --git a/include/X11/fonts/fontmisc.h b/include/X11/fonts/fontmisc.h index 3fc60ff..8df5a6a 100644 --- a/include/X11/fonts/fontmisc.h +++ b/include/X11/fonts/fontmisc.h @@ -59,21 +59,8 @@ extern Atom MakeAtom ( char *string, unsigned len, int makeit ); extern int ValidAtom ( Atom atom ); extern char *NameForAtom (Atom atom); -#ifndef _HAVE_XALLOC_DECLS -#define _HAVE_XALLOC_DECLS -extern pointer Xalloc(unsigned long); -extern pointer Xrealloc(pointer, unsigned long); -extern void Xfree(pointer); -extern pointer Xcalloc(unsigned long); -#endif extern int f_strcasecmp(const char *s1, const char *s2); -#ifndef xalloc -#define xalloc(n) Xalloc ((unsigned) n) -#define xfree(p) Xfree ((pointer) p) -#define xrealloc(p,n) Xrealloc ((pointer)p,n) -#define xcalloc(n,s) Xcalloc((unsigned) n * (unsigned) s) -#endif #define lowbit(x) ((x) & (~(x) + 1)) #undef assert |