From 8015dfe298b7c7af87f89f1b6598436b47d8f005 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Thu, 29 Mar 2012 10:10:41 +0000 Subject: (x)dvipdfmx: Remove all extern decls from *.c files git-svn-id: svn://tug.org/texlive/trunk@25774 c570f23f-e606-0410-a88d-b1316a301751 --- .../dvipdfmx/dvipdfmx-20110311-PATCHES/ChangeLog | 10 ++++ .../dvipdfmx-20110311-PATCHES/patch-08-extern | 67 ++++++++++++++++++++++ .../texk/dvipdfmx/dvipdfmx-20110311/src/dpxfile.c | 5 -- .../texk/dvipdfmx/dvipdfmx-20110311/src/dvipdfmx.c | 2 +- .../texk/dvipdfmx/dvipdfmx-20110311/src/error.c | 2 - .../texk/dvipdfmx/dvipdfmx-20110311/src/error.h | 2 +- .../dvipdfmx/dvipdfmx-20110311/src/spc_color.c | 2 +- Build/source/texk/xdvipdfmx/ChangeLog.TL | 19 ++++++ Build/source/texk/xdvipdfmx/src/dpxfile.c | 5 -- Build/source/texk/xdvipdfmx/src/dvi.c | 5 -- Build/source/texk/xdvipdfmx/src/dvi.h | 4 ++ Build/source/texk/xdvipdfmx/src/dvipdfmx.c | 4 +- Build/source/texk/xdvipdfmx/src/error.c | 2 - Build/source/texk/xdvipdfmx/src/error.h | 2 +- Build/source/texk/xdvipdfmx/src/fontmap.h | 3 + Build/source/texk/xdvipdfmx/src/spc_color.c | 2 +- Build/source/texk/xdvipdfmx/src/tt_aux.c | 2 - Build/source/texk/xdvipdfmx/src/tt_aux.h | 2 + 18 files changed, 113 insertions(+), 27 deletions(-) create mode 100644 Build/source/texk/dvipdfmx/dvipdfmx-20110311-PATCHES/patch-08-extern (limited to 'Build') diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311-PATCHES/ChangeLog b/Build/source/texk/dvipdfmx/dvipdfmx-20110311-PATCHES/ChangeLog index a0579a900f3..6a6bb5806a1 100644 --- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311-PATCHES/ChangeLog +++ b/Build/source/texk/dvipdfmx/dvipdfmx-20110311-PATCHES/ChangeLog @@ -1,3 +1,13 @@ +2012-03-29 Peter Breitenlohner + + * patch-08-extern (new): Remove extern decls from *.c files. + * dpxfile.c: Drop obsolete comment that mkstemp may not be + declared in stdlib.h. + * spc_color.c: Drop 'extern' from function definition. + * error.h: ANSI C prototype for error_cleanup(). + * error.c: Drop extern decl, now in error.h. + * dvipdfmx.c: Add '#include "error.h"' and drop extern decl. + 2012-03-05 Peter Breitenlohner * patch-07-surrogates (new): Handle UTP-16 surrogates for UCS-4 diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311-PATCHES/patch-08-extern b/Build/source/texk/dvipdfmx/dvipdfmx-20110311-PATCHES/patch-08-extern new file mode 100644 index 00000000000..b5087a90e7f --- /dev/null +++ b/Build/source/texk/dvipdfmx/dvipdfmx-20110311-PATCHES/patch-08-extern @@ -0,0 +1,67 @@ + Remove extern decls from *.c files. + +diff -ur dvipdfmx-20110311.orig/src/dpxfile.c dvipdfmx-20110311/src/dpxfile.c +--- dvipdfmx-20110311.orig/src/dpxfile.c 2011-06-06 09:50:11.000000000 +0200 ++++ dvipdfmx-20110311/src/dpxfile.c 2012-03-29 11:39:16.000000000 +0200 +@@ -744,13 +744,8 @@ + + #ifdef HAVE_MKSTEMP + # include +-/* extern int mkstemp(const char *); */ + #endif + +-/* Please fix: GCC warning +- * warning: implicit declaration of function `mkstemp' +- * mkstemp may not be declared in stdlib.h. +- */ + char * + dpx_create_temp_file (void) + { +diff -ur dvipdfmx-20110311.orig/src/dvipdfmx.c dvipdfmx-20110311/src/dvipdfmx.c +--- dvipdfmx-20110311.orig/src/dvipdfmx.c 2011-03-08 03:08:35.000000000 +0100 ++++ dvipdfmx-20110311/src/dvipdfmx.c 2012-03-29 11:46:06.000000000 +0200 +@@ -59,7 +59,7 @@ + #include "dvipdfmx.h" + #include "xbb.h" + +-extern void error_cleanup (void); ++#include "error.h" + + int compat_mode = 0; /* 0 = dvipdfmx, 1 = dvipdfm */ + +diff -ur dvipdfmx-20110311.orig/src/error.c dvipdfmx-20110311/src/error.c +--- dvipdfmx-20110311.orig/src/error.c 2011-03-05 05:44:49.000000000 +0100 ++++ dvipdfmx-20110311/src/error.c 2012-03-29 11:46:14.000000000 +0200 +@@ -73,8 +73,6 @@ + } + } + +-extern void error_cleanup (void); +- + void + ERROR (const char *fmt, ...) + { +diff -ur dvipdfmx-20110311.orig/src/error.h dvipdfmx-20110311/src/error.h +--- dvipdfmx-20110311.orig/src/error.h 2011-03-05 05:44:49.000000000 +0100 ++++ dvipdfmx-20110311/src/error.h 2012-03-29 11:45:20.000000000 +0200 +@@ -27,7 +27,7 @@ + + #include "system.h" + +-extern void error_cleanup(); ++extern void error_cleanup (void); + + #define FATAL_ERROR -1 + #define NO_ERROR 0 +diff -ur dvipdfmx-20110311.orig/src/spc_color.c dvipdfmx-20110311/src/spc_color.c +--- dvipdfmx-20110311.orig/src/spc_color.c 2011-03-06 04:14:15.000000000 +0100 ++++ dvipdfmx-20110311/src/spc_color.c 2012-03-29 11:37:55.000000000 +0200 +@@ -140,7 +140,7 @@ + return r; + } + +-extern int ++int + spc_color_setup_handler (struct spc_handler *sph, + struct spc_env *spe, struct spc_arg *ap) + { diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/dpxfile.c b/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/dpxfile.c index a13058708a6..9547202a997 100644 --- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/dpxfile.c +++ b/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/dpxfile.c @@ -744,13 +744,8 @@ dpx_find_dfont_file (const char *filename) #ifdef HAVE_MKSTEMP # include -/* extern int mkstemp(const char *); */ #endif -/* Please fix: GCC warning - * warning: implicit declaration of function `mkstemp' - * mkstemp may not be declared in stdlib.h. - */ char * dpx_create_temp_file (void) { diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/dvipdfmx.c b/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/dvipdfmx.c index e576eea500d..923cf172fc8 100644 --- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/dvipdfmx.c +++ b/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/dvipdfmx.c @@ -59,7 +59,7 @@ #include "dvipdfmx.h" #include "xbb.h" -extern void error_cleanup (void); +#include "error.h" int compat_mode = 0; /* 0 = dvipdfmx, 1 = dvipdfm */ diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/error.c b/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/error.c index ac0a1d8a79f..ae0640c3786 100644 --- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/error.c +++ b/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/error.c @@ -73,8 +73,6 @@ WARN (const char *fmt, ...) } } -extern void error_cleanup (void); - void ERROR (const char *fmt, ...) { diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/error.h b/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/error.h index 68b414d20c5..87309953230 100644 --- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/error.h +++ b/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/error.h @@ -27,7 +27,7 @@ #include "system.h" -extern void error_cleanup(); +extern void error_cleanup (void); #define FATAL_ERROR -1 #define NO_ERROR 0 diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/spc_color.c b/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/spc_color.c index 38679baf5c8..76f41757b66 100644 --- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/spc_color.c +++ b/Build/source/texk/dvipdfmx/dvipdfmx-20110311/src/spc_color.c @@ -140,7 +140,7 @@ spc_color_check_special (const char *buf, long len) return r; } -extern int +int spc_color_setup_handler (struct spc_handler *sph, struct spc_env *spe, struct spc_arg *ap) { diff --git a/Build/source/texk/xdvipdfmx/ChangeLog.TL b/Build/source/texk/xdvipdfmx/ChangeLog.TL index ea1a38b7520..83b002074f2 100644 --- a/Build/source/texk/xdvipdfmx/ChangeLog.TL +++ b/Build/source/texk/xdvipdfmx/ChangeLog.TL @@ -1,6 +1,25 @@ ChangeLog.TL: TeX Live (TL) changes for xdvipdfmx ================================================= +2012-03-29 Peter Breitenlohner + + Remove extern decls from *.c files. + + * dvi.c: Move extern decls from here ... + * dvi.h: ... to here ... + * fontmap.h: ... and here. + + * tt_aux.c: Move extern decl from here ... + * tt_aux.h: ... to here ... + * dvipdfmx.c: ... and #include "tt_aux.h". + + * dpxfile.c: Drop obsolete comment that mkstemp may not be + declared in stdlib.h. + * spc_color.c: Drop 'extern' from function definition. + * error.h: ANSI C prototype for error_cleanup(). + * error.c: Drop extern decl, now in error.h. + * dvipdfmx.c: Add '#include "error.h"' and drop extern decl. + 2012-03-05 Peter Breitenlohner * pdfdev.c (handle_multibyte_string): Handle UTP-16 surrogates diff --git a/Build/source/texk/xdvipdfmx/src/dpxfile.c b/Build/source/texk/xdvipdfmx/src/dpxfile.c index a171483e8b1..0ee6e437b04 100644 --- a/Build/source/texk/xdvipdfmx/src/dpxfile.c +++ b/Build/source/texk/xdvipdfmx/src/dpxfile.c @@ -743,13 +743,8 @@ dpx_find_dfont_file (const char *filename) #ifdef HAVE_MKSTEMP # include -/* extern int mkstemp(const char *); */ #endif -/* Please fix: GCC warning - * warning: implicit declaration of function `mkstemp' - * mkstemp may not be declared in stdlib.h. - */ char * dpx_create_temp_file (void) { diff --git a/Build/source/texk/xdvipdfmx/src/dvi.c b/Build/source/texk/xdvipdfmx/src/dvi.c index f6b4f8a92e7..ba2d251f260 100644 --- a/Build/source/texk/xdvipdfmx/src/dvi.c +++ b/Build/source/texk/xdvipdfmx/src/dvi.c @@ -1915,9 +1915,6 @@ do_native_font_def (int scanning) } } -/* globals initialized by fontmap.c when it opens freetype */ -extern FT_Int ft_major, ft_minor, ft_patch; - static void do_glyph_array (int yLocsPresent) { @@ -2500,8 +2497,6 @@ scan_special (double *wd, double *ht, double *xo, double *yo, char *lm, const char *p = buf, *endptr; int ns_pdf = 0, ns_xtx = 0, error = 0; double tmp; - extern double paper_width, paper_height; - extern char landscape_mode; endptr = p + size; diff --git a/Build/source/texk/xdvipdfmx/src/dvi.h b/Build/source/texk/xdvipdfmx/src/dvi.h index 396d9b8f0f1..5a559521741 100644 --- a/Build/source/texk/xdvipdfmx/src/dvi.h +++ b/Build/source/texk/xdvipdfmx/src/dvi.h @@ -30,6 +30,10 @@ /* spt_t */ #include "pdfdev.h" +/* instantiated in dvipdfmx.c */ +extern double paper_width, paper_height; +extern char landscape_mode; + extern double get_origin (int x); extern void dvi_set_verbose (void); diff --git a/Build/source/texk/xdvipdfmx/src/dvipdfmx.c b/Build/source/texk/xdvipdfmx/src/dvipdfmx.c index 2f18b448375..05394e616f5 100644 --- a/Build/source/texk/xdvipdfmx/src/dvipdfmx.c +++ b/Build/source/texk/xdvipdfmx/src/dvipdfmx.c @@ -63,7 +63,9 @@ #include "xbb.h" -extern void error_cleanup (void); +#include "tt_aux.h" + +#include "error.h" static int verbose = 0; diff --git a/Build/source/texk/xdvipdfmx/src/error.c b/Build/source/texk/xdvipdfmx/src/error.c index b23571879d5..d1c840143b7 100644 --- a/Build/source/texk/xdvipdfmx/src/error.c +++ b/Build/source/texk/xdvipdfmx/src/error.c @@ -73,8 +73,6 @@ WARN (const char *fmt, ...) } } -extern void error_cleanup (void); - void ERROR (const char *fmt, ...) { diff --git a/Build/source/texk/xdvipdfmx/src/error.h b/Build/source/texk/xdvipdfmx/src/error.h index 762cc282a51..f63f4f998a7 100644 --- a/Build/source/texk/xdvipdfmx/src/error.h +++ b/Build/source/texk/xdvipdfmx/src/error.h @@ -27,7 +27,7 @@ #include "system.h" -extern void error_cleanup(); +extern void error_cleanup (void); #define FATAL_ERROR -1 #define NO_ERROR 0 diff --git a/Build/source/texk/xdvipdfmx/src/fontmap.h b/Build/source/texk/xdvipdfmx/src/fontmap.h index 59b00f07297..75de62374d1 100644 --- a/Build/source/texk/xdvipdfmx/src/fontmap.h +++ b/Build/source/texk/xdvipdfmx/src/fontmap.h @@ -40,6 +40,9 @@ #ifdef XETEX #include "ft2build.h" #include FT_FREETYPE_H + +/* globals initialized by fontmap.c when it opens freetype */ +extern FT_Int ft_major, ft_minor, ft_patch; #endif /* Options */ diff --git a/Build/source/texk/xdvipdfmx/src/spc_color.c b/Build/source/texk/xdvipdfmx/src/spc_color.c index d787bd4b3cc..682a18f01a7 100644 --- a/Build/source/texk/xdvipdfmx/src/spc_color.c +++ b/Build/source/texk/xdvipdfmx/src/spc_color.c @@ -165,7 +165,7 @@ spc_color_check_special (const char *buf, long len) return r; } -extern int +int spc_color_setup_handler (struct spc_handler *sph, struct spc_env *spe, struct spc_arg *ap) { diff --git a/Build/source/texk/xdvipdfmx/src/tt_aux.c b/Build/source/texk/xdvipdfmx/src/tt_aux.c index 60cf894b69d..7af4234aaf0 100644 --- a/Build/source/texk/xdvipdfmx/src/tt_aux.c +++ b/Build/source/texk/xdvipdfmx/src/tt_aux.c @@ -36,8 +36,6 @@ #include "tt_post.h" #include "tt_aux.h" -extern int always_embed; /* flag declared in dvipdfmx.c */ - static int verbose = 0; void tt_aux_set_verbose(void) diff --git a/Build/source/texk/xdvipdfmx/src/tt_aux.h b/Build/source/texk/xdvipdfmx/src/tt_aux.h index 00256585e52..28a5f2e5cee 100644 --- a/Build/source/texk/xdvipdfmx/src/tt_aux.h +++ b/Build/source/texk/xdvipdfmx/src/tt_aux.h @@ -26,6 +26,8 @@ #include "pdfobj.h" #include "sfnt.h" +extern int always_embed; /* flag declared in dvipdfmx.c */ + extern void tt_aux_set_verbose(void); /* TTC (TrueType Collection) */ -- cgit v1.2.3