summaryrefslogtreecommitdiff
path: root/Build/source/utils/t1utils
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2015-03-02 10:33:44 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2015-03-02 10:33:44 +0000
commit150e0f99f646d96e92600fb3d83f33a635790269 (patch)
treefbbfcb5912864a2248e35b5fc51cf789ee71c927 /Build/source/utils/t1utils
parentf18280dd886e289b95722e3f69713cbfb836a463 (diff)
utils/t1utils: Avoid compiler warnings
git-svn-id: svn://tug.org/texlive/trunk@36420 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/utils/t1utils')
-rw-r--r--Build/source/utils/t1utils/t1utils-1.39-PATCHES/ChangeLog1
-rw-r--r--Build/source/utils/t1utils/t1utils-1.39-PATCHES/patch-07-warnings25
-rw-r--r--Build/source/utils/t1utils/t1utils-1.39/t1asmhelp.h6
3 files changed, 29 insertions, 3 deletions
diff --git a/Build/source/utils/t1utils/t1utils-1.39-PATCHES/ChangeLog b/Build/source/utils/t1utils/t1utils-1.39-PATCHES/ChangeLog
index 74cefd25514..0aa285f538f 100644
--- a/Build/source/utils/t1utils/t1utils-1.39-PATCHES/ChangeLog
+++ b/Build/source/utils/t1utils/t1utils-1.39-PATCHES/ChangeLog
@@ -4,6 +4,7 @@
* patch-03-warnings, patch-04-TL-binary, patch-05-getopt:
Adapted.
* patch-06-unsigned (removed): Now handled in original sources.
+ * patch-07-warnings (new): Avoid compiler warnings.
2014-06-19 Peter Breitenlohner <peb@mppmu.mpg.de>
diff --git a/Build/source/utils/t1utils/t1utils-1.39-PATCHES/patch-07-warnings b/Build/source/utils/t1utils/t1utils-1.39-PATCHES/patch-07-warnings
new file mode 100644
index 00000000000..26f81378cba
--- /dev/null
+++ b/Build/source/utils/t1utils/t1utils-1.39-PATCHES/patch-07-warnings
@@ -0,0 +1,25 @@
+ Avoid compiler warnings (gcc's -Wcast-qual).
+
+diff -ur t1utils-1.39.orig/t1asmhelp.h t1utils-1.39/t1asmhelp.h
+--- t1utils-1.39.orig/t1asmhelp.h 2015-02-26 21:31:27.000000000 +0100
++++ t1utils-1.39/t1asmhelp.h 2015-03-02 11:09:49.000000000 +0100
+@@ -18,8 +18,8 @@
+ }
+ }
+
+-
+-static const char* cs_start = "";
++static char cs_start_init[] = "";
++static char *cs_start = cs_start_init;
+
+ static void
+ set_cs_start(const char* line)
+@@ -36,7 +36,7 @@
+ for (r = q; r != p && !isspace((unsigned char) *r) && *r != '{'; ++r)
+ /* nada */;
+ if (cs_start_set)
+- free((char*) cs_start);
++ free(cs_start);
+ cs_start = p = malloc(r - q + 1);
+ memcpy(p, q, r - q);
+ p[r - q] = 0;
diff --git a/Build/source/utils/t1utils/t1utils-1.39/t1asmhelp.h b/Build/source/utils/t1utils/t1utils-1.39/t1asmhelp.h
index c974fc7999f..6c4b333c88e 100644
--- a/Build/source/utils/t1utils/t1utils-1.39/t1asmhelp.h
+++ b/Build/source/utils/t1utils/t1utils-1.39/t1asmhelp.h
@@ -18,8 +18,8 @@ set_lenIV(const char* line)
}
}
-
-static const char* cs_start = "";
+static char cs_start_init[] = "";
+static char *cs_start = cs_start_init;
static void
set_cs_start(const char* line)
@@ -36,7 +36,7 @@ set_cs_start(const char* line)
for (r = q; r != p && !isspace((unsigned char) *r) && *r != '{'; ++r)
/* nada */;
if (cs_start_set)
- free((char*) cs_start);
+ free(cs_start);
cs_start = p = malloc(r - q + 1);
memcpy(p, q, r - q);
p[r - q] = 0;