summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c/luatexdir
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2010-04-14 08:19:50 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2010-04-14 08:19:50 +0000
commitcf42cec28487ec62783c7aaeecbaea79862794bf (patch)
tree814d0e116392c6e1fe6070bd7046c77523ed0bcf /Build/source/texk/web2c/luatexdir
parent7bd6eff399db384f6275e5aa8fd5c1a9aa0b66d8 (diff)
minor build fixes
git-svn-id: svn://tug.org/texlive/trunk@17864 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/luatexdir')
-rw-r--r--Build/source/texk/web2c/luatexdir/ChangeLog4
-rw-r--r--Build/source/texk/web2c/luatexdir/luatex.c10
-rw-r--r--Build/source/texk/web2c/luatexdir/pdf/pdflistout.w8
3 files changed, 13 insertions, 9 deletions
diff --git a/Build/source/texk/web2c/luatexdir/ChangeLog b/Build/source/texk/web2c/luatexdir/ChangeLog
index 052d5994386..852833f971e 100644
--- a/Build/source/texk/web2c/luatexdir/ChangeLog
+++ b/Build/source/texk/web2c/luatexdir/ChangeLog
@@ -11,6 +11,10 @@
* image/pdftoepdf.cc: Fix building with libpoppler.
* luatex.c: Fix building for MinGW32.
+ * luatex.c (ipcpage): Avoid compiler warning.
+ (catch_interrupt): Declare as static.
+ * pdf/pdflistout.w (init_*_backend_functions): ANSI C func defs.
+
2010-04-13 Taco Hoekwater <taco@luatex>
* new import from luatex repository (HEAD of 0.60.x branch)
diff --git a/Build/source/texk/web2c/luatexdir/luatex.c b/Build/source/texk/web2c/luatexdir/luatex.c
index 6c934579cfa..02fcd642ef9 100644
--- a/Build/source/texk/web2c/luatexdir/luatex.c
+++ b/Build/source/texk/web2c/luatexdir/luatex.c
@@ -635,10 +635,10 @@ void ipcpage(int is_eof)
{
static boolean begun = false;
unsigned len = 0;
- string p = (string) "";
+ string p = NULL;
if (!begun) {
- const_string name; /* Just the filename. */
+ string name; /* Just the filename. */
string cwd = xgetcwd();
ipc_open_out();
@@ -646,7 +646,7 @@ void ipcpage(int is_eof)
/* Have to pass whole filename to the other end, since it may have
been started up and running as a daemon, e.g., as with the NeXT
preview program. */
- name = (const_string) static_pdf->file_name;
+ name = static_pdf->file_name;
p = concat3(cwd, DIR_SEP_STRING, name);
/* free(name); */
len = strlen(p);
@@ -654,7 +654,7 @@ void ipcpage(int is_eof)
}
ipc_snd(len, is_eof, p);
- if (len > 0) {
+ if (p) {
free(p);
}
}
@@ -694,7 +694,7 @@ string normalize_quotes(const_string name, const_string mesg)
variable `interrupt'; then they will do everything needed. */
#ifdef WIN32
/* Win32 doesn't set SIGINT ... */
-BOOL WINAPI catch_interrupt(DWORD arg)
+static BOOL WINAPI catch_interrupt(DWORD arg)
{
switch (arg) {
case CTRL_C_EVENT:
diff --git a/Build/source/texk/web2c/luatexdir/pdf/pdflistout.w b/Build/source/texk/web2c/luatexdir/pdf/pdflistout.w
index 374ee173721..67be319082e 100644
--- a/Build/source/texk/web2c/luatexdir/pdf/pdflistout.w
+++ b/Build/source/texk/web2c/luatexdir/pdf/pdflistout.w
@@ -53,14 +53,14 @@ static void missing_backend_function(PDF pdf, halfword p)
}
@ @c
-static void init_none_backend_functions()
+static void init_none_backend_functions(void)
{
backend_struct *p = &backend[OMODE_NONE];
p->name = strdup("(None)");
}
@ @c
-static void init_pdf_backend_functions()
+static void init_pdf_backend_functions(void)
{
backend_struct *p = &backend[OMODE_PDF];
p->name = strdup("PDF");
@@ -85,7 +85,7 @@ static void init_pdf_backend_functions()
}
@ @c
-static void init_dvi_backend_functions()
+static void init_dvi_backend_functions(void)
{
backend_struct *p = &backend[OMODE_DVI];
p->name = strdup("DVI");
@@ -96,7 +96,7 @@ static void init_dvi_backend_functions()
}
@ @c
-static void init_lua_backend_functions()
+static void init_lua_backend_functions(void)
{
backend_struct *p = &backend[OMODE_LUA];
p->name = strdup("Lua");