diff --git a/extern/ttconv/global_defines.h b/extern/ttconv/global_defines.h deleted file mode 100644 index 04dd41e02ac1..000000000000 --- a/extern/ttconv/global_defines.h +++ /dev/null @@ -1,41 +0,0 @@ -/* -*- mode: c; c-basic-offset: 4 -*- */ - -/* - * Modified for use within matplotlib - * 5 July 2007 - * Michael Droettboom - */ - -/* -** ~ppr/src/include/global_defines.h -** Copyright 1995, Trinity College Computing Center. -** Written by David Chappell. -** -** Permission to use, copy, modify, and distribute this software and its -** documentation for any purpose and without fee is hereby granted, provided -** that the above copyright notice appear in all copies and that both that -** copyright notice and this permission notice appear in supporting -** documentation. This software and documentation are provided "as is" without -** express or implied warranty. -** -** The PPR project was begun 28 December 1992. -** -** There are many things in this file you may want to change. This file -** should be the first include file. It is the header file for the whole -** project. -** -** This file was last modified 22 December 1995. -*/ - -/* -** TRUE and FALSE -** The code makes liberal use of these macros. -*/ -#if !defined(FALSE) -#define FALSE 0 -#endif -#if !defined(TRUE) -#define TRUE !FALSE -#endif - -/* end of file */ diff --git a/extern/ttconv/pprdrv_tt.cpp b/extern/ttconv/pprdrv_tt.cpp index c0837a7d9d30..934215470808 100644 --- a/extern/ttconv/pprdrv_tt.cpp +++ b/extern/ttconv/pprdrv_tt.cpp @@ -24,7 +24,6 @@ ** Last revised 19 December 1995. */ -#include "global_defines.h" #include #include #include @@ -130,7 +129,7 @@ BYTE *GetTable(struct TTFONT *font, const char *name) /* We must search the table directory. */ ptr = font->offset_table + 12; x=0; - while (TRUE) + while (true) { if ( strncmp((const char*)ptr,name,4) == 0 ) { @@ -559,7 +558,7 @@ void ttfont_FontInfo(TTStreamWriter& stream, struct TTFONT *font) -------------------------------------------------------------------*/ int string_len; int line_len; -int in_string; +bool in_string; /* ** This is called once at the start. @@ -567,7 +566,7 @@ int in_string; void sfnts_start(TTStreamWriter& stream) { stream.puts("/sfnts[<"); - in_string=TRUE; + in_string=true; string_len=0; line_len=8; } /* end of sfnts_start() */ @@ -584,7 +583,7 @@ void sfnts_pputBYTE(TTStreamWriter& stream, BYTE n) stream.put_char('<'); string_len=0; line_len++; - in_string=TRUE; + in_string=true; } stream.put_char( hexdigits[ n / 16 ] ); @@ -650,7 +649,7 @@ void sfnts_end_string(TTStreamWriter& stream) stream.put_char('>'); line_len++; } - in_string=FALSE; + in_string=false; } /* end of sfnts_end_string() */ /* diff --git a/extern/ttconv/pprdrv_tt2.cpp b/extern/ttconv/pprdrv_tt2.cpp index 2643afa09930..058bc005348b 100644 --- a/extern/ttconv/pprdrv_tt2.cpp +++ b/extern/ttconv/pprdrv_tt2.cpp @@ -32,7 +32,6 @@ ** Last revised 11 July 1995. */ -#include "global_defines.h" #include #include #include diff --git a/extern/ttconv/ttutil.cpp b/extern/ttconv/ttutil.cpp index 13aa170e0f2f..85e7e23c4f07 100644 --- a/extern/ttconv/ttutil.cpp +++ b/extern/ttconv/ttutil.cpp @@ -9,7 +9,6 @@ /* Very simple interface to the ppr TT routines */ /* (c) Frank Siegert 1996 */ -#include "global_defines.h" #include #include #include