summaryrefslogtreecommitdiff
path: root/Build/source/libs
diff options
context:
space:
mode:
authorTaco Hoekwater <taco@elvenkind.com>2008-04-28 08:45:24 +0000
committerTaco Hoekwater <taco@elvenkind.com>2008-04-28 08:45:24 +0000
commit5b93d006ed6fa1c5990c7079d92d3b7d195068b0 (patch)
treed2ddf0f582719f4e67e618f99a47fa32db728c27 /Build/source/libs
parent6b4bb4d5747a2819cb015fcfe7e6a7521580adbb (diff)
Aix compilation fixes a from Vladimir Volovich
git-svn-id: svn://tug.org/texlive/trunk@7695 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs')
-rw-r--r--Build/source/libs/lua51/liolib.c3
-rw-r--r--Build/source/libs/luafilesystem/src/lfs.c3
-rw-r--r--Build/source/libs/luafontforge/Makefile6
-rw-r--r--Build/source/libs/luafontforge/fontforge/Unicode/Makefile6
-rw-r--r--Build/source/libs/luafontforge/fontforge/fontforge/Makefile6
-rw-r--r--Build/source/libs/luafontforge/fontforge/fontforge/namelist.c2
-rw-r--r--Build/source/libs/luafontforge/fontforge/inc/basics.h6
-rw-r--r--Build/source/libs/luazlib/lzlib.c10
8 files changed, 21 insertions, 21 deletions
diff --git a/Build/source/libs/lua51/liolib.c b/Build/source/libs/lua51/liolib.c
index c009946079e..f86e436ff2a 100644
--- a/Build/source/libs/lua51/liolib.c
+++ b/Build/source/libs/lua51/liolib.c
@@ -157,9 +157,10 @@ static int io_open (lua_State *L) {
static int io_open_ro (lua_State *L) {
const char *filename = luaL_checkstring(L, 1);
const char *mode = luaL_optstring(L, 2, "r");
+ FILE **pf;
if ((strcmp(mode,"r")!= 0)&&(strcmp(mode,"rb")!=0))
return pushresult(L, 0, filename);
- FILE **pf = newfile(L);
+ pf = newfile(L);
*pf = fopen(filename, mode);
return (*pf == NULL) ? pushresult(L, 0, filename) : 1;
}
diff --git a/Build/source/libs/luafilesystem/src/lfs.c b/Build/source/libs/luafilesystem/src/lfs.c
index ee2920412d1..eea8bfaca83 100644
--- a/Build/source/libs/luafilesystem/src/lfs.c
+++ b/Build/source/libs/luafilesystem/src/lfs.c
@@ -256,6 +256,8 @@ static int remove_dir (lua_State *L) {
static int dir_iter (lua_State *L) {
#ifdef _WIN32
struct _finddata_t c_file;
+#else
+ struct dirent *entry;
#endif
dir_data *d = (dir_data *)lua_touserdata (L, lua_upvalueindex (1));
luaL_argcheck (L, !d->closed, 1, "closed directory");
@@ -281,7 +283,6 @@ static int dir_iter (lua_State *L) {
}
}
#else
- struct dirent *entry;
if ((entry = readdir (d->dir)) != NULL) {
lua_pushstring (L, entry->d_name);
return 1;
diff --git a/Build/source/libs/luafontforge/Makefile b/Build/source/libs/luafontforge/Makefile
index 84564f19ad2..a160ab19650 100644
--- a/Build/source/libs/luafontforge/Makefile
+++ b/Build/source/libs/luafontforge/Makefile
@@ -4,8 +4,8 @@ srcdir=../../../libs/luafontforge
FF_LIB=ffdummies.o luafflib.o
-_CFLAGS=-Wall -DFONTFORGE_CONFIG_NO_WINDOWING_UI=1 -DLUA_FF_LIB=1 $(XCFLAGS)
-CFLAGS = -g -O2
+_CFLAGS=-DFONTFORGE_CONFIG_NO_WINDOWING_UI=1 -DLUA_FF_LIB=1 $(XCFLAGS)
+#CFLAGS = -g -O2
.PHONY: newfile
@@ -17,7 +17,7 @@ fontforge: $(FF_LIB) newfile
ranlib libff.a
%.o: $(srcdir)/src/%.c
- gcc $(_CFLAGS) $(CFLAGS) -I$(srcdir)/../lua51 -I$(srcdir)/fontforge/inc -I$(srcdir)/fontforge/fontforge -c $< -o $@
+ $(CC) $(_CFLAGS) $(CFLAGS) -I$(srcdir)/../lua51 -I$(srcdir)/fontforge/inc -I$(srcdir)/fontforge/fontforge -c $< -o $@
clean:
rm -f libff.a $(FF_LIB)
diff --git a/Build/source/libs/luafontforge/fontforge/Unicode/Makefile b/Build/source/libs/luafontforge/fontforge/Unicode/Makefile
index 8e215835910..7538627cb5d 100644
--- a/Build/source/libs/luafontforge/fontforge/Unicode/Makefile
+++ b/Build/source/libs/luafontforge/fontforge/Unicode/Makefile
@@ -2,12 +2,12 @@
top_srcdir = ../../../../libs/luafontforge/fontforge
srcdir = $(top_srcdir)/Unicode
-CC = gcc
+#CC = gcc
OBJECTS = alphabet.o char.o memory.o cjk.o ustring.o gwwiconv.o
-_CFLAGS = -I$(top_srcdir)/inc -Wall -DLUA_FF_LIB=1 $(XCFLAGS)
-CFLAGS = -g -O2
+_CFLAGS = -I$(top_srcdir)/inc -DLUA_FF_LIB=1 $(XCFLAGS)
+#CFLAGS = -g -O2
all: $(OBJECTS)
diff --git a/Build/source/libs/luafontforge/fontforge/fontforge/Makefile b/Build/source/libs/luafontforge/fontforge/fontforge/Makefile
index d0e7b983446..3113228c30a 100644
--- a/Build/source/libs/luafontforge/fontforge/fontforge/Makefile
+++ b/Build/source/libs/luafontforge/fontforge/fontforge/Makefile
@@ -2,7 +2,7 @@
top_srcdir = ../../../../libs/luafontforge/fontforge
srcdir = $(top_srcdir)/fontforge
-CC = gcc
+#CC = gcc
AR = ar cru
RANLIB = ranlib
@@ -14,7 +14,7 @@ OBJECTS =autohint.o charview.o fontinfo.o \
stemdb.o lookups.o featurefile.o \
tottf.o tottfgpos.o tottfvar.o splinesave.o
-_CFLAGS = -I$(top_srcdir)/inc -I$(srcdir) -I. -Wall $(XCFLAGS) \
+_CFLAGS = -I$(top_srcdir)/inc -I$(srcdir) -I. $(XCFLAGS) \
-DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 \
-DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 \
-DHAVE_INTTYPES_H=1 -DHAVE_UNISTD_H=1 -D_NO_PYTHON=1 -DHAVE_LANGINFO_H=1 \
@@ -22,7 +22,7 @@ _CFLAGS = -I$(top_srcdir)/inc -I$(srcdir) -I. -Wall $(XCFLAGS) \
-DNODYNAMIC=1 -D_NO_FREETYPE=1 -D_NO_LIBUNINAMESLIST=1 \
-DFONTFORGE_CONFIG_NO_WINDOWING_UI=1 -DLUA_FF_LIB=1 -UHAVE_LIBINTL_H
-CFLAGS = -g -O2
+#CFLAGS = -g -O2
all: $(OBJECTS)
diff --git a/Build/source/libs/luafontforge/fontforge/fontforge/namelist.c b/Build/source/libs/luafontforge/fontforge/fontforge/namelist.c
index ebc1fc8e4cf..c290afaa8ab 100644
--- a/Build/source/libs/luafontforge/fontforge/fontforge/namelist.c
+++ b/Build/source/libs/luafontforge/fontforge/fontforge/namelist.c
@@ -43,7 +43,7 @@ static struct psaltnames {
char *name;
int unicode;
int provenance; /* 1=> Adobe PUA, 2=>AMS PUA, 3=>TeX */
-} psaltnames[];
+} psaltnames[5487];
static NameList agl_sans, agl, adobepua, greeksc, tex, ams;
NameList *namelist_for_new_fonts = &agl;
diff --git a/Build/source/libs/luafontforge/fontforge/inc/basics.h b/Build/source/libs/luafontforge/fontforge/inc/basics.h
index 04c2fcf54a2..eb3781df017 100644
--- a/Build/source/libs/luafontforge/fontforge/inc/basics.h
+++ b/Build/source/libs/luafontforge/fontforge/inc/basics.h
@@ -45,11 +45,11 @@
#define forever for (;;)
-typedef int32_t int32;
+/* typedef int32_t int32; */
typedef uint32_t uint32;
-typedef int16_t int16;
+/* typedef int16_t int16; */
typedef uint16_t uint16;
-typedef int8_t int8;
+/* typedef int8_t int8; */
typedef uint8_t uint8;
/* An integral type which can hold a pointer */
diff --git a/Build/source/libs/luazlib/lzlib.c b/Build/source/libs/luazlib/lzlib.c
index ebc72d97664..74c9dd21a64 100644
--- a/Build/source/libs/luazlib/lzlib.c
+++ b/Build/source/libs/luazlib/lzlib.c
@@ -199,9 +199,9 @@ static int lzstream_decompress(lua_State *L)
s->avail_in = lua_strlen(L, 2);
{
+ int r;
luaL_Buffer b;
luaL_buffinit(L, &b);
- int r;
do {
s->next_out = luaL_prepbuffer(&b);
@@ -235,9 +235,9 @@ static int lzstream_compress(lua_State *L)
s->avail_in = lua_strlen(L, 2);
{
+ int r;
luaL_Buffer b;
luaL_buffinit(L, &b);
- int r;
do {
s->next_out = luaL_prepbuffer(&b);
@@ -388,11 +388,10 @@ static int lzlib_compress(lua_State *L)
int strategy = luaL_optint(L, 6, Z_DEFAULT_STRATEGY);
int ret;
+ z_stream zs;
luaL_Buffer b;
luaL_buffinit(L, &b);
- z_stream zs;
-
zs.zalloc = Z_NULL;
zs.zfree = Z_NULL;
@@ -450,11 +449,10 @@ static int lzlib_decompress(lua_State *L)
int windowBits = luaL_optint(L, 2, 15);
int ret;
+ z_stream zs;
luaL_Buffer b;
luaL_buffinit(L, &b);
- z_stream zs;
-
zs.zalloc = Z_NULL;
zs.zfree = Z_NULL;