summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTaco Hoekwater <taco@elvenkind.com>2010-05-28 07:31:11 +0000
committerTaco Hoekwater <taco@elvenkind.com>2010-05-28 07:31:11 +0000
commit64cd59c228451a3df60e9078f382fd4e3e14ce35 (patch)
treee0797fa476108eb81c6d1ea9162ebf66899c213c
parent094c6ef08fd42161548a2aed78f8231940703c8a (diff)
fix __attribute__ usage
git-svn-id: svn://tug.org/texlive/trunk@18546 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/web2c/luatexdir/ChangeLog4
-rw-r--r--Build/source/texk/web2c/luatexdir/lua/texluac.w8
-rw-r--r--Build/source/texk/web2c/luatexdir/luafontloader/src/ffdummies.c9
3 files changed, 17 insertions, 4 deletions
diff --git a/Build/source/texk/web2c/luatexdir/ChangeLog b/Build/source/texk/web2c/luatexdir/ChangeLog
index c7044a8b68b..6291a21467f 100644
--- a/Build/source/texk/web2c/luatexdir/ChangeLog
+++ b/Build/source/texk/web2c/luatexdir/ChangeLog
@@ -1,6 +1,8 @@
2010-05-28 Taco Hoekwater <taco@luatex.org>
* luamd5/md.5c: bring in a new version from kepler to fix a
- portability problem with stdint.h
+ portability problem with stdint.h.
+ * luafontloader/src/ffdummies.c, lua/texluac.w: guard __attribute__
+ usage, which is a GNUC only featire.
2010-05-19 Taco Hoekwater <taco@luatex.org>
* printing.w (print_banner, log_banner), luainit.w (lua_initialize):
diff --git a/Build/source/texk/web2c/luatexdir/lua/texluac.w b/Build/source/texk/web2c/luatexdir/lua/texluac.w
index 772d7941d15..3bc7cc2069d 100644
--- a/Build/source/texk/web2c/luatexdir/lua/texluac.w
+++ b/Build/source/texk/web2c/luatexdir/lua/texluac.w
@@ -46,9 +46,15 @@
#include "lua/luatex-api.h"
+
@ @c
static const char _svn_version[] =
- "$Id: texluac.w 3612 2010-04-13 09:29:42Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/lua/texluac.w $";
+ "$Id: texluac.w 3705 2010-05-28 07:19:20Z taco $ $URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/lua/texluac.w $";
+
+/* fix for non-gcc compilation: */
+#if !defined(__GNUC__) || (__GNUC__ < 2)
+# define __attribute__(x)
+#endif /* !defined(__GNUC__) || (__GNUC__ < 2) */
@ @c
#define PROGNAME "texluac" /* default program name */
diff --git a/Build/source/texk/web2c/luatexdir/luafontloader/src/ffdummies.c b/Build/source/texk/web2c/luatexdir/luafontloader/src/ffdummies.c
index 731eafe7430..ffce23e0958 100644
--- a/Build/source/texk/web2c/luatexdir/luafontloader/src/ffdummies.c
+++ b/Build/source/texk/web2c/luatexdir/luafontloader/src/ffdummies.c
@@ -28,10 +28,15 @@
#include <ustring.h>
static const char _svn_version[] =
- "$Id: ffdummies.c 3360 2010-01-12 21:12:15Z hhenkel $ "
- "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.60.0/source/texk/web2c/luatexdir/luafontloader/src/ffdummies.c $";
+ "$Id: ffdummies.c 3706 2010-05-28 07:21:15Z taco $ "
+ "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/luafontloader/src/ffdummies.c $";
+/* fix for non-gcc compilation: */
+#if !defined(__GNUC__) || (__GNUC__ < 2)
+# define __attribute__(x)
+#endif /* !defined(__GNUC__) || (__GNUC__ < 2) */
+
char **gww_errors = NULL;
int gww_error_count = 0;