summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2009-05-17 23:44:01 +0000
committerKarl Berry <karl@freefriends.org>2009-05-17 23:44:01 +0000
commit0ec64c745afe29ac3e41206dfe89d5141e0c4f06 (patch)
tree05c4e6138b6ddd7cc12180ceaf846a80dcc58e30
parent1c565efd4496b6da9fb0589797f8f922bfdf3cc0 (diff)
try to keep our getline away from POSIX
git-svn-id: svn://tug.org/texlive/trunk@13198 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/web2c/ChangeLog7
-rw-r--r--Build/source/texk/web2c/cpascal.h9
2 files changed, 16 insertions, 0 deletions
diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog
index 6423cf52157..fa6d3c416a5 100644
--- a/Build/source/texk/web2c/ChangeLog
+++ b/Build/source/texk/web2c/ChangeLog
@@ -1,3 +1,10 @@
+2009-05-18 Karl Berry <karl@tug.org>
+
+ * cpascal.h (getline): #define to web2c_getline,
+ to try to avoid conflict with a newly broken POSIX and glibc.
+ Report from Gabriele Balducci via Taco, tlbuild mail
+ 17 May 2009 17:56:54.
+
2009-05-12 Peter Breitenlohner <peb@mppmu.mpg.de>
* vftovp.ch: Send print_real to stderr.
diff --git a/Build/source/texk/web2c/cpascal.h b/Build/source/texk/web2c/cpascal.h
index 20903abe2e5..7ce0a165d32 100644
--- a/Build/source/texk/web2c/cpascal.h
+++ b/Build/source/texk/web2c/cpascal.h
@@ -272,6 +272,15 @@ typedef struct option getoptstruct;
#undef getname
#define getname vms_getname
#endif
+
+/* Apparently POSIX 2008 has getline and glibc 2.9.90 exports it.
+ tangle, weave, et al. use that symbol; try to define it away so
+ something that a standard won't usurp. */
+#ifdef getline
+#undef getline
+#endif
+#define getline web2c_getline
+
/* Declarations for the routines we provide ourselves in lib/. */