diff options
Diffstat (limited to 'Build/source/utils/chktex/chktex-1.6.6-PATCHES/patch-06-extern')
-rw-r--r-- | Build/source/utils/chktex/chktex-1.6.6-PATCHES/patch-06-extern | 52 |
1 files changed, 29 insertions, 23 deletions
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 |