summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2012-10-23 11:20:56 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2012-10-23 11:20:56 +0000
commit4099f27cc4a1d1d4ecbb1e36114e51bc832127a2 (patch)
tree8718b6724f3cf9d4f1482869bc41882f3209b613
parent5506e72faf3eae254d3b13df938fce42d9df3f3b (diff)
chktex: Remove TL vs W32TeX diffs (MSVC warnings)
git-svn-id: svn://tug.org/texlive/trunk@28057 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/chktex/chktex-1.7.1-PATCHES/ChangeLog5
-rw-r--r--Build/source/texk/chktex/chktex-1.7.1-PATCHES/patch-13-char47
-rw-r--r--Build/source/texk/chktex/chktex-1.7.1/FindErrs.c6
-rw-r--r--Build/source/texk/chktex/chktex-1.7.1/Utility.h6
4 files changed, 58 insertions, 6 deletions
diff --git a/Build/source/texk/chktex/chktex-1.7.1-PATCHES/ChangeLog b/Build/source/texk/chktex/chktex-1.7.1-PATCHES/ChangeLog
index f679420e397..317495bacca 100644
--- a/Build/source/texk/chktex/chktex-1.7.1-PATCHES/ChangeLog
+++ b/Build/source/texk/chktex/chktex-1.7.1-PATCHES/ChangeLog
@@ -1,3 +1,8 @@
+2012-10-23 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * patch-13-char (new): Modify a function parameter and a few
+ local variables int => char in order to avois MSVC warnings.
+
2012-10-22 Peter Breitenlohner <peb@mppmu.mpg.de>
* patch-10-semicolon: Adapt to upstream.
diff --git a/Build/source/texk/chktex/chktex-1.7.1-PATCHES/patch-13-char b/Build/source/texk/chktex/chktex-1.7.1-PATCHES/patch-13-char
new file mode 100644
index 00000000000..261a22c069c
--- /dev/null
+++ b/Build/source/texk/chktex/chktex-1.7.1-PATCHES/patch-13-char
@@ -0,0 +1,47 @@
+ Modify a function parameter and a few local variables
+ int => char in order to avois MSVC warnings.
+
+ Replace 'char const' => 'const char'.
+
+diff -ur chktex-1.7.1.orig/FindErrs.c chktex-1.7.1/FindErrs.c
+--- chktex-1.7.1.orig/FindErrs.c 2012-10-22 10:34:58.000000000 +0200
++++ chktex-1.7.1/FindErrs.c 2012-10-22 20:53:21.000000000 +0200
+@@ -1027,11 +1027,11 @@
+ *
+ */
+
+-static void HandleBracket(int Char)
++static void HandleBracket(char Char)
+ {
+ unsigned long BrOffset; /* Offset into BrOrder array */
+ struct ErrInfo *ei;
+- int TmpC, Match;
++ char TmpC, Match;
+ char ABuf[2], BBuf[2];
+ char *TmpPtr;
+
+@@ -1235,7 +1235,7 @@
+ char *TmpPtr; /* Temporary pointer */
+ char *ErrPtr; /* Ptr to where an error started */
+
+- int TmpC, /* Just a temp var used throughout the proc. */
++ char TmpC, /* Just a temp var used throughout the proc. */
+ MatchC, Char; /* Char. currently processed */
+ unsigned long CmdLen; /* Length of misc. things */
+ int MixingQuotes;
+diff -ur chktex-1.7.1.orig/Utility.h chktex-1.7.1/Utility.h
+--- chktex-1.7.1.orig/Utility.h 2012-08-04 18:40:33.000000000 +0200
++++ chktex-1.7.1/Utility.h 2012-10-22 20:53:20.707448783 +0200
+@@ -150,9 +150,9 @@
+ struct ErrInfo *PopErr(struct Stack *Stack);
+ struct ErrInfo *TopMatch(struct Stack *Stack, char *String);
+
+-long BrackIndex(char const c);
+-void AddBracket(char const c);
+-char MatchBracket(char const);
++long BrackIndex(const char c);
++void AddBracket(const char c);
++char MatchBracket(const char c);
+
+
+
diff --git a/Build/source/texk/chktex/chktex-1.7.1/FindErrs.c b/Build/source/texk/chktex/chktex-1.7.1/FindErrs.c
index 7d4eed52066..6d7507718ee 100644
--- a/Build/source/texk/chktex/chktex-1.7.1/FindErrs.c
+++ b/Build/source/texk/chktex/chktex-1.7.1/FindErrs.c
@@ -1027,11 +1027,11 @@ static void CheckDash(void)
*
*/
-static void HandleBracket(int Char)
+static void HandleBracket(char Char)
{
unsigned long BrOffset; /* Offset into BrOrder array */
struct ErrInfo *ei;
- int TmpC, Match;
+ char TmpC, Match;
char ABuf[2], BBuf[2];
char *TmpPtr;
@@ -1235,7 +1235,7 @@ int FindErr(const char *_RealBuf, const unsigned long _Line)
char *TmpPtr; /* Temporary pointer */
char *ErrPtr; /* Ptr to where an error started */
- int TmpC, /* Just a temp var used throughout the proc. */
+ char TmpC, /* Just a temp var used throughout the proc. */
MatchC, Char; /* Char. currently processed */
unsigned long CmdLen; /* Length of misc. things */
int MixingQuotes;
diff --git a/Build/source/texk/chktex/chktex-1.7.1/Utility.h b/Build/source/texk/chktex/chktex-1.7.1/Utility.h
index 8afab6b67a0..2bfd4b053dc 100644
--- a/Build/source/texk/chktex/chktex-1.7.1/Utility.h
+++ b/Build/source/texk/chktex/chktex-1.7.1/Utility.h
@@ -150,9 +150,9 @@ struct ErrInfo *TopErr(struct Stack *Stack);
struct ErrInfo *PopErr(struct Stack *Stack);
struct ErrInfo *TopMatch(struct Stack *Stack, char *String);
-long BrackIndex(char const c);
-void AddBracket(char const c);
-char MatchBracket(char const);
+long BrackIndex(const char c);
+void AddBracket(const char c);
+char MatchBracket(const char c);