summaryrefslogtreecommitdiff
path: root/Build/source/texk/cjkutils
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2014-11-05 12:14:58 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2014-11-05 12:14:58 +0000
commit20316e76cda72a8e581f2456ae93139486f4e124 (patch)
tree292c334d025213555ea73bd22ec1878d3d03019e /Build/source/texk/cjkutils
parent166fe2d6af0d6ac9b2701bd95cd6873e5e8c5808 (diff)
MinGW64/WIN64 build fixes
git-svn-id: svn://tug.org/texlive/trunk@35517 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/cjkutils')
-rw-r--r--Build/source/texk/cjkutils/cjkutils-4.8.3-PATCHES/ChangeLog4
-rw-r--r--Build/source/texk/cjkutils/cjkutils-4.8.3-PATCHES/patch-04-mingw6421
-rw-r--r--Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/hbf2gf.w4
-rw-r--r--Build/source/texk/cjkutils/hbf2gf.c4
4 files changed, 29 insertions, 4 deletions
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.3-PATCHES/ChangeLog b/Build/source/texk/cjkutils/cjkutils-4.8.3-PATCHES/ChangeLog
index 8e45faff786..1d1f37acc82 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.3-PATCHES/ChangeLog
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.3-PATCHES/ChangeLog
@@ -1,3 +1,7 @@
+2014-11-05 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * patch-04-mingw64 (new): Required for MinGW64, but why?
+
2014-06-19 Peter Breitenlohner <peb@mppmu.mpg.de>
* patch-03-unsigned (new): Avoid undefined behaviour.
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.3-PATCHES/patch-04-mingw64 b/Build/source/texk/cjkutils/cjkutils-4.8.3-PATCHES/patch-04-mingw64
new file mode 100644
index 00000000000..9232116055d
--- /dev/null
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.3-PATCHES/patch-04-mingw64
@@ -0,0 +1,21 @@
+diff -ur cjkutils-4.8.3.orig/hbf2gf/hbf2gf.w cjkutils-4.8.3/hbf2gf/hbf2gf.w
+--- cjkutils-4.8.3.orig/hbf2gf/hbf2gf.w 2014-06-19 12:44:16.000000000 +0200
++++ cjkutils-4.8.3/hbf2gf/hbf2gf.w 2014-11-05 12:56:50.000000000 +0100
+@@ -486,7 +486,7 @@
+ @d GF_ID 131
+ @d PRE 247@#
+
+-@d header " hbf2gf output "
++@d headertstring " hbf2gf output "
+
+ @<Prototypes@>=
+ static void write_pre(void);
+@@ -502,7 +502,7 @@
+ struct tm *time_now;
+
+
+- strcpy(out_s, header);@#
++ strcpy(out_s, headertstring);@#
+
+ secs_now = time(NULL); /* system date and time */
+ time_now = localtime(&secs_now);
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/hbf2gf.w b/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/hbf2gf.w
index 20663537a94..21fd1df2e53 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/hbf2gf.w
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/hbf2gf.w
@@ -486,7 +486,7 @@ no terminating NULL byte.
@d GF_ID 131
@d PRE 247@#
-@d header " hbf2gf output "
+@d headertstring " hbf2gf output "
@<Prototypes@>=
static void write_pre(void);
@@ -502,7 +502,7 @@ static void write_pre(void)
struct tm *time_now;
- strcpy(out_s, header);@#
+ strcpy(out_s, headertstring);@#
secs_now = time(NULL); /* system date and time */
time_now = localtime(&secs_now);
diff --git a/Build/source/texk/cjkutils/hbf2gf.c b/Build/source/texk/cjkutils/hbf2gf.c
index 598b86cd765..14d296f6767 100644
--- a/Build/source/texk/cjkutils/hbf2gf.c
+++ b/Build/source/texk/cjkutils/hbf2gf.c
@@ -41,7 +41,7 @@
#define GF_ID 131
#define PRE 247 \
-#define header " hbf2gf output " \
+#define headerstring " hbf2gf output " \
#define BOC 67
#define BOC1 68
@@ -798,7 +798,7 @@ time_t secs_now;
struct tm*time_now;
-strcpy(out_s,header);
+strcpy(out_s,headerstring);
secs_now= time(NULL);
time_now= localtime(&secs_now);