From 17a7d32b1d972c5b5bd849776d17d357e9c35993 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Sun, 17 Mar 2013 12:13:59 +0000 Subject: bibtexu: Further reduce diffs with bibtex8 git-svn-id: svn://tug.org/texlive/trunk@29408 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/bibtexu/ChangeLog | 3 ++- Build/source/texk/bibtexu/bibtex-2.c | 10 ++-------- Build/source/texk/bibtexu/bibtex-3.c | 8 -------- Build/source/texk/bibtexu/bibtex-4.c | 8 -------- Build/source/texk/bibtexu/bibtex.c | 7 ------- Build/source/texk/bibtexu/gblprocs.h | 1 + Build/source/texk/bibtexu/utils.c | 9 ++------- Build/source/texk/bibtexu/utils.h | 5 +---- 8 files changed, 8 insertions(+), 43 deletions(-) diff --git a/Build/source/texk/bibtexu/ChangeLog b/Build/source/texk/bibtexu/ChangeLog index 26fe393c02d..b8105f95b28 100644 --- a/Build/source/texk/bibtexu/ChangeLog +++ b/Build/source/texk/bibtexu/ChangeLog @@ -2,7 +2,8 @@ Reduce diffs with bibtex8. * bibtex-[1-4].c, bibtex.[ch], gblprocs.h, gblvars.h, - utils.[ch]: Drop unused code and adjust white space. + utils.[ch]: Drop unused code and adjust white space, + #include "unicode/*.h" only through gblprocs.h. 2013-02-08 Peter Breitenlohner diff --git a/Build/source/texk/bibtexu/bibtex-2.c b/Build/source/texk/bibtexu/bibtex-2.c index a4a92582b25..f12abe88abb 100644 --- a/Build/source/texk/bibtexu/bibtex-2.c +++ b/Build/source/texk/bibtexu/bibtex-2.c @@ -141,14 +141,8 @@ #include "gblvars.h" #include "utils.h" #include "version.h" -/* -Include the ICU heads. 23/sep/2009 -*/ -#include "unicode/ustdio.h" -#include "unicode/uchar.h" -#include "unicode/ustring.h" -#include "unicode/ucnv.h" -#include "unicode/ucol.h" + + /*************************************************************************** * WEB section number: 325 * ~~~~~~~~~~~~~~~~~~~ diff --git a/Build/source/texk/bibtexu/bibtex-3.c b/Build/source/texk/bibtexu/bibtex-3.c index 1bd25901dcf..dd6df5603d2 100644 --- a/Build/source/texk/bibtexu/bibtex-3.c +++ b/Build/source/texk/bibtexu/bibtex-3.c @@ -144,15 +144,7 @@ #include "utils.h" #include "version.h" -/* -Include the ICU heads. 23/sep/2009 -*/ -#include "unicode/ustdio.h" -#include "unicode/uchar.h" -#include "unicode/ustring.h" -#include "unicode/ucnv.h" -#include "unicode/ucol.h" /*************************************************************************** * WEB section number: 336 * ~~~~~~~~~~~~~~~~~~~ diff --git a/Build/source/texk/bibtexu/bibtex-4.c b/Build/source/texk/bibtexu/bibtex-4.c index 0a5d987531b..ae06cf0ae18 100644 --- a/Build/source/texk/bibtexu/bibtex-4.c +++ b/Build/source/texk/bibtexu/bibtex-4.c @@ -136,14 +136,6 @@ #include "version.h" -/* -Include the ICU heads. 23/sep/2009 -*/ - -#include "unicode/ustdio.h" -#include "unicode/uchar.h" -#include "unicode/ucnv.h" -#include "unicode/ucol.h" /*************************************************************************** * WEB section number: 364 * ~~~~~~~~~~~~~~~~~~~ diff --git a/Build/source/texk/bibtexu/bibtex.c b/Build/source/texk/bibtexu/bibtex.c index 2b09ecb93c9..653e51e5f8f 100644 --- a/Build/source/texk/bibtexu/bibtex.c +++ b/Build/source/texk/bibtexu/bibtex.c @@ -115,13 +115,6 @@ #include "utils.h" #include "version.h" -/* -Include the ICU heads. 23/sep/2009 -*/ -#include "unicode/uchar.h" -#include "unicode/ustdio.h" -#include "unicode/ucnv.h" -#include "unicode/ucol.h" /*************************************************************************** * WEB section number: 39 diff --git a/Build/source/texk/bibtexu/gblprocs.h b/Build/source/texk/bibtexu/gblprocs.h index 8844b936273..b650d26f0f5 100644 --- a/Build/source/texk/bibtexu/gblprocs.h +++ b/Build/source/texk/bibtexu/gblprocs.h @@ -94,6 +94,7 @@ #include "unicode/uchar.h" #include "unicode/ustdio.h" +#include "unicode/ustring.h" #include "unicode/ucnv.h" #include "unicode/ucol.h" int32_t icu_toUChars (BufType_T buf, diff --git a/Build/source/texk/bibtexu/utils.c b/Build/source/texk/bibtexu/utils.c index bed9119390f..d818f0f1092 100644 --- a/Build/source/texk/bibtexu/utils.c +++ b/Build/source/texk/bibtexu/utils.c @@ -148,13 +148,7 @@ #include "utils.h" #include "version.h" -/* -Include the ICU heads. 23/sep/2009 -*/ -#include "unicode/ustdio.h" -#include "unicode/uchar.h" -#include "unicode/ucnv.h" -#include "unicode/ucol.h" + /* ** Useful macros to keep the code nicely formatted. */ @@ -177,6 +171,7 @@ Include the ICU heads. 23/sep/2009 #define VALUE_NONE 0 #define VALUE_REQD 1 #define VALUE_OPT 2 + /* Add the option "-l" for language, and "-o" for location. 23/sep/2009 */ diff --git a/Build/source/texk/bibtexu/utils.h b/Build/source/texk/bibtexu/utils.h index 0f6ab6d6978..f75e0760bff 100644 --- a/Build/source/texk/bibtexu/utils.h +++ b/Build/source/texk/bibtexu/utils.h @@ -100,10 +100,7 @@ # define CDECL #endif /* WIN32 */ -#include "unicode/uchar.h" -#include "unicode/ustdio.h" -#include "unicode/ucnv.h" -#include "unicode/ucol.h" + /* ** Declaration of public functions defined in utils.c */ -- cgit v1.2.3