diff options
Diffstat (limited to 'freetype/src/psnames')
-rw-r--r-- | freetype/src/psnames/Jamfile | 2 | ||||
-rw-r--r-- | freetype/src/psnames/module.mk | 2 | ||||
-rw-r--r-- | freetype/src/psnames/psmodule.c | 4 | ||||
-rw-r--r-- | freetype/src/psnames/psmodule.h | 2 | ||||
-rw-r--r-- | freetype/src/psnames/psnamerr.h | 2 | ||||
-rw-r--r-- | freetype/src/psnames/psnames.c | 2 | ||||
-rw-r--r-- | freetype/src/psnames/pspic.c | 2 | ||||
-rw-r--r-- | freetype/src/psnames/pspic.h | 2 | ||||
-rw-r--r-- | freetype/src/psnames/pstables.h | 2 | ||||
-rw-r--r-- | freetype/src/psnames/rules.mk | 7 |
10 files changed, 15 insertions, 12 deletions
diff --git a/freetype/src/psnames/Jamfile b/freetype/src/psnames/Jamfile index 06c0dda66..b9fe23509 100644 --- a/freetype/src/psnames/Jamfile +++ b/freetype/src/psnames/Jamfile @@ -1,6 +1,6 @@ # FreeType 2 src/psnames Jamfile # -# Copyright 2001 by +# Copyright 2001-2015 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, diff --git a/freetype/src/psnames/module.mk b/freetype/src/psnames/module.mk index a6e908257..3708f6036 100644 --- a/freetype/src/psnames/module.mk +++ b/freetype/src/psnames/module.mk @@ -3,7 +3,7 @@ # -# Copyright 1996-2000, 2006 by +# Copyright 1996-2015 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, diff --git a/freetype/src/psnames/psmodule.c b/freetype/src/psnames/psmodule.c index 4d172b9c8..1f9850140 100644 --- a/freetype/src/psnames/psmodule.c +++ b/freetype/src/psnames/psmodule.c @@ -4,7 +4,7 @@ /* */ /* PSNames module implementation (body). */ /* */ -/* Copyright 1996-2003, 2005-2008, 2012-2014 by */ +/* Copyright 1996-2015 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -312,7 +312,7 @@ /* we first allocate the table */ table->num_maps = 0; - table->maps = 0; + table->maps = NULL; if ( !FT_NEW_ARRAY( table->maps, num_glyphs + EXTRA_GLYPH_LIST_SIZE ) ) { diff --git a/freetype/src/psnames/psmodule.h b/freetype/src/psnames/psmodule.h index 28fa14807..f85f32219 100644 --- a/freetype/src/psnames/psmodule.h +++ b/freetype/src/psnames/psmodule.h @@ -4,7 +4,7 @@ /* */ /* High-level PSNames module interface (specification). */ /* */ -/* Copyright 1996-2001 by */ +/* Copyright 1996-2015 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/freetype/src/psnames/psnamerr.h b/freetype/src/psnames/psnamerr.h index acda7f967..09cc247b7 100644 --- a/freetype/src/psnames/psnamerr.h +++ b/freetype/src/psnames/psnamerr.h @@ -4,7 +4,7 @@ /* */ /* PS names module error codes (specification only). */ /* */ -/* Copyright 2001, 2012 by */ +/* Copyright 2001-2015 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/freetype/src/psnames/psnames.c b/freetype/src/psnames/psnames.c index 1ede225dc..a4385961e 100644 --- a/freetype/src/psnames/psnames.c +++ b/freetype/src/psnames/psnames.c @@ -4,7 +4,7 @@ /* */ /* FreeType PSNames module component (body only). */ /* */ -/* Copyright 1996-2001 by */ +/* Copyright 1996-2015 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/freetype/src/psnames/pspic.c b/freetype/src/psnames/pspic.c index 2b3d381b0..660360a52 100644 --- a/freetype/src/psnames/pspic.c +++ b/freetype/src/psnames/pspic.c @@ -4,7 +4,7 @@ /* */ /* The FreeType position independent code services for psnames module. */ /* */ -/* Copyright 2009, 2010, 2012, 2013 by */ +/* Copyright 2009-2015 by */ /* Oran Agra and Mickey Gabel. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/freetype/src/psnames/pspic.h b/freetype/src/psnames/pspic.h index 578301f2a..a99a3d715 100644 --- a/freetype/src/psnames/pspic.h +++ b/freetype/src/psnames/pspic.h @@ -4,7 +4,7 @@ /* */ /* The FreeType position independent code services for psnames module. */ /* */ -/* Copyright 2009, 2012 by */ +/* Copyright 2009-2015 by */ /* Oran Agra and Mickey Gabel. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/freetype/src/psnames/pstables.h b/freetype/src/psnames/pstables.h index 0a6637f98..3f31c31b1 100644 --- a/freetype/src/psnames/pstables.h +++ b/freetype/src/psnames/pstables.h @@ -4,7 +4,7 @@ /* */ /* PostScript glyph names. */ /* */ -/* Copyright 2005, 2008, 2011 by */ +/* Copyright 2005-2015 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/freetype/src/psnames/rules.mk b/freetype/src/psnames/rules.mk index f321de2d6..3c774867f 100644 --- a/freetype/src/psnames/rules.mk +++ b/freetype/src/psnames/rules.mk @@ -3,7 +3,7 @@ # -# Copyright 1996-2001, 2003, 2011, 2013 by +# Copyright 1996-2015 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, @@ -20,7 +20,10 @@ PSNAMES_DIR := $(SRC_DIR)/psnames # compilation flags for the driver # -PSNAMES_COMPILE := $(FT_COMPILE) $I$(subst /,$(COMPILER_SEP),$(PSNAMES_DIR)) +PSNAMES_COMPILE := $(CC) $(ANSIFLAGS) \ + $I$(subst /,$(COMPILER_SEP),$(PSNAMES_DIR)) \ + $(INCLUDE_FLAGS) \ + $(FT_CFLAGS) # PSNames driver sources (i.e., C files) |