From 815aa8dc74cdce511947fa852bcbced1b21142ab Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Mon, 16 Apr 2012 13:36:56 +0000 Subject: chktex: Minor update git-svn-id: svn://tug.org/texlive/trunk@25984 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/utils/chktex/ChangeLog | 6 +++ Build/source/utils/chktex/Makefile.in | 2 +- .../utils/chktex/chktex-1.6.6-PATCHES/ChangeLog | 5 +++ .../chktex/chktex-1.6.6-PATCHES/patch-06-extern | 52 ++++++++++++---------- Build/source/utils/chktex/chktex-1.6.6/Utility.c | 10 +---- Build/source/utils/chktex/configure.ac | 4 +- Build/source/utils/chktex/getopt.h | 4 +- Build/source/utils/chktex/version.ac | 11 +++++ 8 files changed, 57 insertions(+), 37 deletions(-) create mode 100644 Build/source/utils/chktex/version.ac (limited to 'Build/source') diff --git a/Build/source/utils/chktex/ChangeLog b/Build/source/utils/chktex/ChangeLog index a7d5d538ad3..31856dd84bb 100644 --- a/Build/source/utils/chktex/ChangeLog +++ b/Build/source/utils/chktex/ChangeLog @@ -1,5 +1,11 @@ +2012-04-16 Peter Breitenlohner + + * version.ac: New file defining the chktex version. + * configure.ac: Adapt. + 2012-04-10 Karl Berry + Import chktex-1.6.6. * Makefile.am (dist_pdfdoc_DATA): ChkTeX.pdf is now distributed from upstream. (ChkTeX.pdf, CLEANFILES, stamp-tex, all-local, diff --git a/Build/source/utils/chktex/Makefile.in b/Build/source/utils/chktex/Makefile.in index a1474294bf1..cf2f4ea61c8 100644 --- a/Build/source/utils/chktex/Makefile.in +++ b/Build/source/utils/chktex/Makefile.in @@ -69,7 +69,7 @@ subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \ $(top_srcdir)/../../m4/kpse-warnings.m4 \ - $(top_srcdir)/../../m4/kpse-win32.m4 \ + $(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/version.ac \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) diff --git a/Build/source/utils/chktex/chktex-1.6.6-PATCHES/ChangeLog b/Build/source/utils/chktex/chktex-1.6.6-PATCHES/ChangeLog index cd584bb8434..7ca3c25b576 100644 --- a/Build/source/utils/chktex/chktex-1.6.6-PATCHES/ChangeLog +++ b/Build/source/utils/chktex/chktex-1.6.6-PATCHES/ChangeLog @@ -1,3 +1,8 @@ +2012-04-16 Peter Breitenlohner + + * patch-06-extern: Remove the obsolete ASM_HASHWORD stuff (for + Amiga) avoiding extern decls from *.c files. + 2012-04-10 Karl Berry * patch-01-const, diff --git a/Build/source/utils/chktex/chktex-1.6.6-PATCHES/patch-06-extern b/Build/source/utils/chktex/chktex-1.6.6-PATCHES/patch-06-extern index 086488b66b5..f99a34f9f6c 100644 --- a/Build/source/utils/chktex/chktex-1.6.6-PATCHES/patch-06-extern +++ b/Build/source/utils/chktex/chktex-1.6.6-PATCHES/patch-06-extern @@ -1,10 +1,10 @@ - Remove extern decls from *.c files. - (Not installed in upstream 1.6.6. Propose static function instead?) + Remove the obsolete ASM_HASHWORD stuff (for Amiga) + avoiding extern decls from *.c files. -diff -ur chktex-1.6.4.orig/Utility.c chktex-1.6.4/Utility.c ---- chktex-1.6.4.orig/Utility.c 2010-06-13 14:50:28.000000000 +0200 -+++ chktex-1.6.4/Utility.c 2012-03-29 14:09:07.000000000 +0200 -@@ -31,13 +31,6 @@ +diff -ur chktex-1.6.6.orig/Utility.c chktex-1.6.6/Utility.c +--- chktex-1.6.6.orig/Utility.c 2010-12-18 22:18:49.000000000 +0100 ++++ chktex-1.6.6/Utility.c 2012-04-16 14:20:46.000000000 +0200 +@@ -31,12 +31,7 @@ #include "Resource.h" #include "OpSys.h" @@ -12,26 +12,32 @@ diff -ur chktex-1.6.4.orig/Utility.c chktex-1.6.4/Utility.c -extern unsigned short HashWord(const char *a); -typedef unsigned short HASH_TYPE; -#else --typedef unsigned long HASH_TYPE; + typedef unsigned long HASH_TYPE; -#endif -- - /***************************** SUPPORT FUNCTIONS ************************/ + /***************************** SUPPORT FUNCTIONS ************************/ -diff -ur chktex-1.6.4.orig/Utility.h chktex-1.6.4/Utility.h ---- chktex-1.6.4.orig/Utility.h 2010-05-02 21:59:49.000000000 +0200 -+++ chktex-1.6.4/Utility.h 2012-03-29 14:09:07.000000000 +0200 -@@ -49,6 +49,13 @@ - #define FORWL(ind, list) for(ind = 0; ind < (list).Stack.Used; ind++) +@@ -389,14 +384,12 @@ + /*************************** HASH INDEX **************************/ + /* +- * Hashes a string. The string ought be rather short. We use an asm +- * version the Amiga; note that this returns an unsigned short instead. ++ * Hashes a string. The string ought be rather short. + * + * The algorithm was designed by Peter Weinberger. This version was + * adapted from Dr Dobb's Journal April 1996 page 26. + */ -+#ifdef ASM_HASHWORD -+extern unsigned short HashWord(const char *a); -+typedef unsigned short HASH_TYPE; -+#else -+typedef unsigned long HASH_TYPE; -+#endif -+ - enum Strip +-#ifndef ASM_HASHWORD + static unsigned long HashWord(const char *str) { - STRP_LFT = 0x01, + register unsigned long h = 0, hbit, c; +@@ -411,7 +404,6 @@ + + return (h); + } +-#endif + + /* + * Inserts a string into a hash index. Note: You'll have to diff --git a/Build/source/utils/chktex/chktex-1.6.6/Utility.c b/Build/source/utils/chktex/chktex-1.6.6/Utility.c index 9c027629c2a..165c8d223c1 100644 --- a/Build/source/utils/chktex/chktex-1.6.6/Utility.c +++ b/Build/source/utils/chktex/chktex-1.6.6/Utility.c @@ -31,12 +31,7 @@ #include "Resource.h" #include "OpSys.h" -#ifdef ASM_HASHWORD -extern unsigned short HashWord(const char *a); -typedef unsigned short HASH_TYPE; -#else typedef unsigned long HASH_TYPE; -#endif /***************************** SUPPORT FUNCTIONS ************************/ @@ -389,14 +384,12 @@ int strinfront(const char *Str, const char *Cmp) /*************************** HASH INDEX **************************/ /* - * Hashes a string. The string ought be rather short. We use an asm - * version the Amiga; note that this returns an unsigned short instead. + * Hashes a string. The string ought be rather short. * * The algorithm was designed by Peter Weinberger. This version was * adapted from Dr Dobb's Journal April 1996 page 26. */ -#ifndef ASM_HASHWORD static unsigned long HashWord(const char *str) { register unsigned long h = 0, hbit, c; @@ -411,7 +404,6 @@ static unsigned long HashWord(const char *str) return (h); } -#endif /* * Inserts a string into a hash index. Note: You'll have to diff --git a/Build/source/utils/chktex/configure.ac b/Build/source/utils/chktex/configure.ac index d75abdbf90e..5afb0797103 100644 --- a/Build/source/utils/chktex/configure.ac +++ b/Build/source/utils/chktex/configure.ac @@ -8,11 +8,11 @@ dnl with or without modifications, as long as this notice is preserved. dnl dnl ********************************************************************* dnl -dnl Adapted for TeX Live from chktex-*/configure.in +dnl Adapted for TeX Live from chktex-1.6.4/configure.in dnl dnl ********************************************************************* dnl -m4_define([chktex_version], [1.6.6])[]dnl using unmodified chktex source tree +m4_include([version.ac])[] dnl define chktex_version AC_INIT([ChkTeX for TeX Live], chktex_version, [tex-k@tug.org]) AC_PREREQ([2.65]) AC_CONFIG_SRCDIR([chktex-]chktex_version[/ChkTeX.c]) diff --git a/Build/source/utils/chktex/getopt.h b/Build/source/utils/chktex/getopt.h index a2530b8bf8f..8acf05fb4fb 100644 --- a/Build/source/utils/chktex/getopt.h +++ b/Build/source/utils/chktex/getopt.h @@ -121,8 +121,8 @@ struct option /* Many other libraries have conflicting prototypes for getopt, with differences in the consts, in stdlib.h. To avoid compilation errors, only prototype getopt for the GNU C library. And not when - compiling with C++; g++ 4.7.0 has introduced a conflicting - declaration. */ + compiling with C++; g++ 4.7.0 chokes on conflicting exception + specifications. */ #if !defined (__cplusplus) extern KPSEDLL int getopt (int argc, char *const *argv, const char *shortopts); #endif diff --git a/Build/source/utils/chktex/version.ac b/Build/source/utils/chktex/version.ac new file mode 100644 index 00000000000..0cfc38830b8 --- /dev/null +++ b/Build/source/utils/chktex/version.ac @@ -0,0 +1,11 @@ +dnl +dnl Copyright (C) 2012 Peter Breitenlohner +dnl +dnl This file is free software; the copyright holder +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. +dnl +dnl -------------------------------------------------------- +dnl +dnl m4-include this file to define the current chktex version +m4_define([chktex_version], [1.6.6]) -- cgit v1.2.3