From 6c13410a05dd31e489f0adf4633d4fb30915070a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 23 Jan 2016 07:26:49 +0100 Subject: Renumbering d/p/* --- debian/patches/0120-fix-types-include.diff | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 debian/patches/0120-fix-types-include.diff (limited to 'debian/patches/0120-fix-types-include.diff') diff --git a/debian/patches/0120-fix-types-include.diff b/debian/patches/0120-fix-types-include.diff new file mode 100644 index 0000000..8643c44 --- /dev/null +++ b/debian/patches/0120-fix-types-include.diff @@ -0,0 +1,30 @@ +Author: Pino Toscano +Description: Fix xbtypes.h usage + a) do not redefine xbOffT everytime xbtypes.h is included + b) do not include xbtypes.h in xbcdx.cpp, since it will be indirectly pulled + by xbase64.h +Forwarded: no +Last-Update: 2014-09-13 + +--- a/xbase64/xbcdx.cpp ++++ b/xbase64/xbcdx.cpp +@@ -1,4 +1,3 @@ +-#include "xbtypes.h" + #include "xbcdx.h" + + xbShort xbCdx::CreateIndex(const char* filename, const char *expr, +--- a/xbase64/xbtypes.h ++++ b/xbase64/xbtypes.h +@@ -85,7 +85,6 @@ typedef short int xbBool; + #else + #endif + #endif // XB_LOCKING_ON +-#endif // __XB_XTYPES_H__ + + // 64 bit file processing + #if defined(HAVE_FSEEKO) && defined(HAVE_FTELLO) && defined(XB_LARGEFILE_SUPPORT) +@@ -97,3 +96,4 @@ typedef short int xbBool; + #define _fseek fseek + typedef long xbOffT; + #endif ++#endif // __XB_XTYPES_H__ -- cgit v1.2.3