diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2013-06-24 09:42:47 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2013-06-24 09:42:47 +0000 |
commit | e82a4ec6e8f06840867512112128041581c022e7 (patch) | |
tree | 19f7ea4fe44f1ae5f9c7b1dd349b7e2ba1cb9ba1 /Build/source/texk/ttf2pk2/newobj.h | |
parent | d8ee324e03e46ef3361a8ade3062034bc45795af (diff) |
ttf2pk (with libttf) now disabled by default
ttf2pk2 (with libfreetype) completed and now enabled by default
git-svn-id: svn://tug.org/texlive/trunk@30893 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/ttf2pk2/newobj.h')
-rw-r--r-- | Build/source/texk/ttf2pk2/newobj.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/Build/source/texk/ttf2pk2/newobj.h b/Build/source/texk/ttf2pk2/newobj.h index 52beb0737ea..7fe4c2c72c1 100644 --- a/Build/source/texk/ttf2pk2/newobj.h +++ b/Build/source/texk/ttf2pk2/newobj.h @@ -15,15 +15,21 @@ #include "ttf2tfm.h" +#if defined(HAVE_LIBKPATHSEA) +#include <kpathsea/config.h> +#define mymalloc xmalloc +#define mycalloc xcalloc +#define myrealloc xrealloc +#else #if (defined(MSDOS) && defined(__TURBOC__)) || \ (defined(OS2) && defined(_MSC_VER)) #define SMALLMALLOC #endif - void *mymalloc(size_t len); -void *mycalloc(size_t len); +void *mycalloc(size_t nmemb, size_t len); void *myrealloc(void *oldp, size_t len); +#endif char *get_line(FILE *f); Boolean texlive_getline(char **bufferp, FILE *f); |