blob: 95fbbe696857f15cfe0aa8264bb586bc17d023c5 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
|
Author: Pino Toscano <pino@debian.org>
Description: Fix xbtypes.h usage
a) do not redefine xbOffT every time 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__
|
