summaryrefslogtreecommitdiff
path: root/Build/source/texk/psutils
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2014-03-06 12:38:16 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2014-03-06 12:38:16 +0000
commit05e88b695a1d56112eee8b4fa0d57f0a1f738231 (patch)
treef4a5bc11562093b4257280a17f55a404b9f4d1a4 /Build/source/texk/psutils
parente71489818a87c5bc99fc792e5b9ee6ec56516ef3 (diff)
Reduce Cygwin compiler warnings
git-svn-id: svn://tug.org/texlive/trunk@33105 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/psutils')
-rw-r--r--Build/source/texk/psutils/ChangeLog6
-rw-r--r--Build/source/texk/psutils/Makefile.am1
-rw-r--r--Build/source/texk/psutils/Makefile.in1
-rw-r--r--Build/source/texk/psutils/config.h.in15
-rw-r--r--Build/source/texk/psutils/configure.ac15
-rw-r--r--Build/source/texk/psutils/texlive.h33
6 files changed, 43 insertions, 28 deletions
diff --git a/Build/source/texk/psutils/ChangeLog b/Build/source/texk/psutils/ChangeLog
index 33993aa72f7..ad035e8111c 100644
--- a/Build/source/texk/psutils/ChangeLog
+++ b/Build/source/texk/psutils/ChangeLog
@@ -1,3 +1,9 @@
+2014-03-06 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * texlive.h: New file with additional code for TeX Live,
+ #included from config.h, such that we can #undef _Noreturn.
+ * configure.ac: Adapted.
+
2014-02-06 Peter Breitenlohner <peb@mppmu.mpg.de>
* Makefile.am: Fix dependencies for build "on demand".
diff --git a/Build/source/texk/psutils/Makefile.am b/Build/source/texk/psutils/Makefile.am
index 8675e80a28f..9d28d9ca54b 100644
--- a/Build/source/texk/psutils/Makefile.am
+++ b/Build/source/texk/psutils/Makefile.am
@@ -22,6 +22,7 @@ libpsutils_a_SOURCES = \
paper-size.c \
progname.c \
progname.h \
+ texlive.h \
verror.h \
verror.c \
xvasprintf.h \
diff --git a/Build/source/texk/psutils/Makefile.in b/Build/source/texk/psutils/Makefile.in
index e82aa3411fb..e78f73d697f 100644
--- a/Build/source/texk/psutils/Makefile.in
+++ b/Build/source/texk/psutils/Makefile.in
@@ -603,6 +603,7 @@ libpsutils_a_SOURCES = \
paper-size.c \
progname.c \
progname.h \
+ texlive.h \
verror.h \
verror.c \
xvasprintf.h \
diff --git a/Build/source/texk/psutils/config.h.in b/Build/source/texk/psutils/config.h.in
index df55454a3f0..02ae8ce7c3d 100644
--- a/Build/source/texk/psutils/config.h.in
+++ b/Build/source/texk/psutils/config.h.in
@@ -178,19 +178,6 @@
such a type exists and the standard includes do not define it. */
#undef uint64_t
-#include <kpathsea/kpathsea.h>
-
-#define _Noreturn
-#define _GL_ATTRIBUTE_CONST
-
-#ifdef WIN32
-# define set_binary_mode(file, mode) _setmode(file, mode)
-# ifndef __MINGW32__
-# define ftello _ftelli64
-# define fseeko _fseeki64
-# endif
-#else
-# define set_binary_mode(file, mode) 0
-#endif
+#include <texlive.h>
#endif /* _PSUTILS_CONFIG_H */
diff --git a/Build/source/texk/psutils/configure.ac b/Build/source/texk/psutils/configure.ac
index aa6249d229a..8b043b45852 100644
--- a/Build/source/texk/psutils/configure.ac
+++ b/Build/source/texk/psutils/configure.ac
@@ -19,20 +19,7 @@ AC_CONFIG_HEADERS([config.h])
AH_TOP([#ifndef _PSUTILS_CONFIG_H
#define _PSUTILS_CONFIG_H 1])
-AH_BOTTOM([#include <kpathsea/kpathsea.h>
-
-#define _Noreturn
-#define _GL_ATTRIBUTE_CONST
-
-#ifdef WIN32
-# define set_binary_mode(file, mode) _setmode(file, mode)
-# ifndef __MINGW32__
-# define ftello _ftelli64
-# define fseeko _fseeki64
-# endif
-#else
-# define set_binary_mode(file, mode) 0
-#endif
+AH_BOTTOM([#include <texlive.h>
#endif /* _PSUTILS_CONFIG_H */])
diff --git a/Build/source/texk/psutils/texlive.h b/Build/source/texk/psutils/texlive.h
new file mode 100644
index 00000000000..fef3f741d4e
--- /dev/null
+++ b/Build/source/texk/psutils/texlive.h
@@ -0,0 +1,33 @@
+/* texlive.h: TeX Live specific declarations - included from config.h
+
+ Copyright 2014 Peter Breitenlohner.
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library 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 Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>. */
+
+#include <kpathsea/kpathsea.h>
+
+#undef _Noreturn /* Cygwin defines this */
+#define _Noreturn
+#define _GL_ATTRIBUTE_CONST
+
+#ifdef WIN32
+# define set_binary_mode(file, mode) _setmode(file, mode)
+# ifndef __MINGW32__
+# define ftello _ftelli64
+# define fseeko _fseeki64
+# endif
+#else
+# define set_binary_mode(file, mode) 0
+#endif
+