[patch] Hardcode inclusion of xlconfig.h

xlconfig_h_inclusion.patch (text/plain), 1.53 KB, created by Petric Frank on 2012-08-08 12:16:39 UTC

--- src/common/xlsys.h	2012-01-16 00:35:24.000000000 +0100
+++ src/common/xlsys.h.new	2012-08-08 13:26:10.000000000 +0200
@@ -31,7 +31,6 @@
 #ifndef XLSLIB_CONFIG_H
 #define XLSLIB_CONFIG_H
 
-#ifdef HAVE_CONFIG_H
 #include "xlconfig.h"
 
 #define CFG_TRUE          1
@@ -49,68 +48,6 @@
 #   define ALLOCATOR_DFLT ALLOCATOR_STL
 #endif
 
-
-#else // HAVE_CONFIG_H
-
-#if defined(_MSC_VER) && defined(WIN32)
-
-#if (_MSC_VER >= 1400)
-
-#if defined(WANT_MICROSOFT_MEMDBG)
-
-// Studio 2008 (and maybe earlier versions too?)
-#define _CRTDBG_MAP_ALLOC
-
-#include "crtdbg.h"
-
-#if defined(_DEBUG) && defined(__cplusplus)
-
-#include <xdebug>
-
-#include <xlocale>
-#include <xiosbase>
-#include <xlocnum>
-#include <xtree>
-
-#define new_dbg		new(_CLIENT_BLOCK, __FILE__, __LINE__)
-#define new			new_dbg
-
-#endif
-
-#endif
-
-#else
-
-// Older versions of MSVC++
-// Fakes the inclusion of crtdbg.h to avoid duplicated symbols
-// of (inlined) new() and delete() operators
-#define _INC_CRTDBG
-
-#endif // _MSC_VER >= 1400
-
-#include "ac-config.win32.h"
-
-#endif // defined(_MSC_VER) && defined(WIN32)
-
-
-
-#define CFG_TRUE          1
-#define CFG_FALSE         0
-
-#define ALLOCATOR_STL     0
-#define ALLOCATOR_BTI     1
-
-#if defined(ALLOC_STL)
-#   define ALLOCATOR_DFLT ALLOCATOR_STL
-#elif defined(ALLOC_BTI)
-#   define ALLOCATOR_DFLT ALLOCATOR_BTI
-#else
-#   define ALLOCATOR_DFLT ALLOCATOR_STL
-#endif
-
-
-#endif
-
 #ifdef __BCPLUSPLUS__
 #  include "ac-config.win32.h"
 // I am assuming this header file is created and include automatically by MSVC.