luaTeX: One and only one prototype per function

git-svn-id: svn://tug.org/texlive/trunk@27248 c570f23f-e606-0410-a88d-b1316a301751

4 files changed, 46 insertions, 11 deletions

diff --git a/Build/source/texk/web2c/luatexdir/ChangeLog b/Build/source/texk/web2c/luatexdir/ChangeLog
index 751e19bfc16..3dc50a4d6c0 100644
--- a/Build/source/texk/web2c/luatexdir/ChangeLog
+++ b/Build/source/texk/web2c/luatexdir/ChangeLog
@@ -3,6 +3,12 @@
 	* lua/luainit.w (lua_initialize): Avoid using asprintf().
 	* utils/utils.w (initversionstring): Avoid using asprintf().
 
+	One and only one prototype per function.
+	* image/epdf.h, utils/utils.h: Add #include "luatex-common.h"
+	and move pdftex_{fail,warn} prototypes from here ...
+	* luatex-common.h (new): ... to here.
+	* am/libluatex.am (libluatex_a_SOURCES): Add the new file.
+
 2012-07-26  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* lua/loslibext.c os_gettimeofday): Use int64_t (from W32TeX).
diff --git a/Build/source/texk/web2c/luatexdir/image/epdf.h b/Build/source/texk/web2c/luatexdir/image/epdf.h
index 685a8f40b85..4e5060282ec 100644
--- a/Build/source/texk/web2c/luatexdir/image/epdf.h
+++ b/Build/source/texk/web2c/luatexdir/image/epdf.h
@@ -1,7 +1,7 @@
 /* epdf.h
 
    Copyright 1996-2006 Han The Thanh <thanh@pdftex.org>
-   Copyright 2006-2010 Taco Hoekwater <taco@luatex.org>
+   Copyright 2006-2012 Taco Hoekwater <taco@luatex.org>
    This file is part of LuaTeX.
 
    LuaTeX is free software; you can redistribute it and/or modify it under
@@ -107,16 +107,14 @@ extern "C" {
     extern void epdf_free(void);
 
     /* utils.c */
-    __attribute__ ((format(printf, 1, 2)))
-    extern void pdftex_warn(const char *fmt, ...);
-    __attribute__ ((noreturn, format(printf, 1, 2)))
-    extern void pdftex_fail(const char *fmt, ...);
     extern char *convertStringToPDFString(char *in, int len);
     extern char *stripzeros(char *a);
 
     /* lepdflib.c */
     int luaopen_epdf(lua_State * L);
 
+#  include "luatex-common.h"
+
 };
 
 /**********************************************************************/
diff --git a/Build/source/texk/web2c/luatexdir/luatex-common.h b/Build/source/texk/web2c/luatexdir/luatex-common.h
new file mode 100644
index 00000000000..a0b34b00476
--- /dev/null
+++ b/Build/source/texk/web2c/luatexdir/luatex-common.h
@@ -0,0 +1,34 @@
+/* luatex-common.h
+
+   Copyright 1996-2006 Han The Thanh <thanh@pdftex.org>
+   Copyright 2006-2012 Taco Hoekwater <taco@luatex.org>
+   This file is part of LuaTeX.
+
+   LuaTeX is free software; you can redistribute it and/or modify it under
+   the terms of the GNU General Public License as published by the Free
+   Software Foundation; either version 2 of the License, or (at your
+   option) any later version.
+
+   LuaTeX is distributed in the hope that it will be useful, but WITHOUT
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+   License for more details.
+
+   You should have received a copy of the GNU General Public License along
+   with LuaTeX; if not, see <http://www.gnu.org/licenses/>. */
+
+/* $Id: luatex-common.h 4054 2011-01-10 19:05:54Z hhenkel $ */
+
+/* This file contains declarations used in C code as well as in C++ code.
+*/
+
+#ifndef LUATEX_COMMON_H
+#  define LUATEX_COMMON_H
+
+/* utils.c */
+__attribute__ ((format(printf, 1, 2)))
+extern void pdftex_warn(const char *fmt, ...);
+__attribute__ ((noreturn, format(printf, 1, 2)))
+extern void pdftex_fail(const char *fmt, ...);
+
+#endif /* LUATEX_COMMON_H */
diff --git a/Build/source/texk/web2c/luatexdir/utils/utils.h b/Build/source/texk/web2c/luatexdir/utils/utils.h
index 82420025eaa..b3bec818e5a 100644
--- a/Build/source/texk/web2c/luatexdir/utils/utils.h
+++ b/Build/source/texk/web2c/luatexdir/utils/utils.h
@@ -1,8 +1,7 @@
 /* utils.h
 
    Copyright 1996-2006 Han The Thanh <thanh@pdftex.org>
-   Copyright 2006-2009 Taco Hoekwater <taco@luatex.org>
-
+   Copyright 2006-2012 Taco Hoekwater <taco@luatex.org>
    This file is part of LuaTeX.
 
    LuaTeX is free software; you can redistribute it and/or modify it under
@@ -32,10 +31,6 @@ void make_subset_tag(fd_entry *);
 __attribute__ ((format(printf, 1, 2)))
 void tex_printf(const char *, ...);
 
-__attribute__ ((noreturn, format(printf, 1, 2)))
-void pdftex_fail(const char *, ...);
-__attribute__ ((format(printf, 1, 2)))
-void pdftex_warn(const char *, ...);
 void garbage_warning(void);
 void make_pdftex_banner(void);
 size_t xfwrite(void *, size_t size, size_t nmemb, FILE *);
@@ -50,4 +45,6 @@ extern void check_pool_overflow(int wsize);
 
 extern char *cur_file_name;
 
+#  include "luatex-common.h"
+
 #endif                          /* UTILS_H */