diff options
| author | marha <marha@users.sourceforge.net> | 2009-07-27 14:09:54 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-07-27 14:09:54 +0000 |
| commit | e3cca1a275a55fcc5e074a7cc7aaa5d0764b9659 (patch) | |
| tree | eec421a528cb2f0fdaff43d4cf82fc0af89c0392 /X11/fonts | |
| parent | 2553bdd7c359cd87525d367761c86932cec5adff (diff) | |
| download | vcxsrv-e3cca1a275a55fcc5e074a7cc7aaa5d0764b9659.tar.gz vcxsrv-e3cca1a275a55fcc5e074a7cc7aaa5d0764b9659.tar.bz2 vcxsrv-e3cca1a275a55fcc5e074a7cc7aaa5d0764b9659.zip | |
vcxsrv compiles now. Still run-time errors.
Diffstat (limited to 'X11/fonts')
| -rw-r--r-- | X11/fonts/fontmisc.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/X11/fonts/fontmisc.h b/X11/fonts/fontmisc.h index 7b8651706..92d4966ca 100644 --- a/X11/fonts/fontmisc.h +++ b/X11/fonts/fontmisc.h @@ -68,6 +68,7 @@ extern Atom MakeAtom ( char *string, unsigned len, int makeit ); extern int ValidAtom ( Atom atom ); extern char *NameForAtom (Atom atom); +#ifndef _MSC_VER #ifndef _HAVE_XALLOC_DECLS #define _HAVE_XALLOC_DECLS extern pointer Xalloc(unsigned long); @@ -75,14 +76,22 @@ extern pointer Xrealloc(pointer, unsigned long); extern void Xfree(pointer); extern pointer Xcalloc(unsigned long); #endif +#endif extern int f_strcasecmp(const char *s1, const char *s2); #ifndef xalloc +#ifdef _MSC_VER +#define xalloc(n) malloc ((unsigned) n) +#define xfree(p) free ((pointer) p) +#define xrealloc(p,n) realloc (p,n) +#define xcalloc(n,s) calloc(n, s) +#else #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 +#endif #define lowbit(x) ((x) & (~(x) + 1)) #undef assert |