amassari 2004/11/15 05:30:40
Modified: c/src/xercesc/util/Compilers VCPPDefs.hpp
c/src/xercesc/util/Platforms/Win32 Win32PlatformUtils.cpp
Log:
Add build target for VC7.1 to create a static library
Revision Changes Path
1.11 +10 -2 xml-xerces/c/src/xercesc/util/Compilers/VCPPDefs.hpp
Index: VCPPDefs.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/Compilers/VCPPDefs.hpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- VCPPDefs.hpp 8 Sep 2004 13:56:32 -0000 1.10
+++ VCPPDefs.hpp 15 Nov 2004 13:30:40 -0000 1.11
@@ -16,6 +16,9 @@
/*
* $Log$
+ * Revision 1.11 2004/11/15 13:30:40 amassari
+ * Add build target for VC7.1 to create a static library
+ *
* Revision 1.10 2004/09/08 13:56:32 peiyongz
* Apache License Version 2.0
*
@@ -112,8 +115,13 @@
// These defines provide the platform specific keywords that they need
// to do this.
//
---------------------------------------------------------------------------
-#define PLATFORM_EXPORT __declspec(dllexport)
-#define PLATFORM_IMPORT __declspec(dllimport)
+#ifdef XML_LIBRARY
+ #define PLATFORM_EXPORT
+ #define PLATFORM_IMPORT
+#else
+ #define PLATFORM_EXPORT __declspec(dllexport)
+ #define PLATFORM_IMPORT __declspec(dllimport)
+#endif
//
---------------------------------------------------------------------------
// Indicate that we do not support native bools
1.26 +10 -12
xml-xerces/c/src/xercesc/util/Platforms/Win32/Win32PlatformUtils.cpp
Index: Win32PlatformUtils.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/Platforms/Win32/Win32PlatformUtils.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- Win32PlatformUtils.cpp 8 Sep 2004 13:56:43 -0000 1.25
+++ Win32PlatformUtils.cpp 15 Nov 2004 13:30:40 -0000 1.26
@@ -34,14 +34,6 @@
#include <stdio.h>
#include <stdlib.h>
-#ifdef _DEBUG
- #ifdef _MSC_VER
- #include <crtdbg.h>
- #else
- #include <assert.h>
- #endif
-#endif
-
//
// These control which transcoding service is used by the Win32 version.
// They allow this to be controlled from the build process by just defining
@@ -814,12 +806,18 @@
// primary jobs here are getting the path to our DLL and to get the
// stdout and stderr file handles setup.
//
+
+// Enable this code for memeory leak testing
+//#define MEM_LEAK_TESTING
+
+#ifdef MEM_LEAK_TESTING
+ #include <crtdbg.h>
+#endif
+
void XMLPlatformUtils::platformInit()
{
-#if 0 && defined(_DEBUG)
- // Enable this code for memeory leak testing
-
+#ifdef MEM_LEAK_TESTING
// Send all reports to STDOUT
_CrtSetReportMode( _CRT_WARN, _CRTDBG_MODE_FILE );
_CrtSetReportFile( _CRT_WARN, _CRTDBG_FILE_STDOUT );
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
