[Clucene-cvs] SF.net SVN: clucene:[2872] branches/lucene2_3_2/src

[<ust...@us...>]

Revision: 2872
          http://clucene.svn.sourceforge.net/clucene/?rev=2872&view=rev
Author:   ustramooner
Date:     2008-08-22 08:54:36 +0000 (Fri, 22 Aug 2008)

Log Message:
-----------
fixes for cygwin, msvc and bcc

Modified Paths:
--------------
    branches/lucene2_3_2/src/core/CLucene/store/LockFactory.cpp
    branches/lucene2_3_2/src/shared/cmake/MacroChooseSymbol.cmake
    branches/lucene2_3_2/src/shared/cmake/MacroChooseType.cmake

Modified: branches/lucene2_3_2/src/core/CLucene/store/LockFactory.cpp
===================================================================
--- branches/lucene2_3_2/src/core/CLucene/store/LockFactory.cpp	2008-08-18 16:54:13 UTC (rev 2871)
+++ branches/lucene2_3_2/src/core/CLucene/store/LockFactory.cpp	2008-08-22 08:54:36 UTC (rev 2872)
@@ -105,7 +105,7 @@
 
 FSLockFactory::~FSLockFactory()
 {
-	_CLDELETE( lockDir );
+	_CLDELETE_CaARRAY( lockDir );
 }
 
 void FSLockFactory::setLockDir( const char* lockDir )

Modified: branches/lucene2_3_2/src/shared/cmake/MacroChooseSymbol.cmake
===================================================================
--- branches/lucene2_3_2/src/shared/cmake/MacroChooseSymbol.cmake	2008-08-18 16:54:13 UTC (rev 2871)
+++ branches/lucene2_3_2/src/shared/cmake/MacroChooseSymbol.cmake	2008-08-22 08:54:36 UTC (rev 2872)
@@ -3,9 +3,14 @@
 INCLUDE (Macro_ChooseStatus)
 
 MACRO(CHOOSE_SYMBOL name options)
-    IF ( HAVE_WINDOWS_H )
-    	SET (CHOOSE_SYMBOL_INCLUDES "${CHOOSE_SYMBOL_INCLUDES};windows.h")
-    ENDIF ( HAVE_WINDOWS_H )
+    #note: don't add windows.h to this list, since we don't want to find things 
+    #in there (bcc might make you think otherwise, but it's true!)...
+    
+    IF ( CYGWIN )
+        #cygwin requires this to determine some things...
+        SET ( CMAKE_REQUIRED_DEFINITIONS "-D_WIN32")
+    ENDIF( CYGWIN )
+    
     IF ( HAVE_LIMITS_H )
     	SET (CHOOSE_SYMBOL_INCLUDES "${CHOOSE_SYMBOL_INCLUDES};limits.h")
     ENDIF ( HAVE_LIMITS_H )
@@ -53,4 +58,5 @@
     ENDIF ( NOT SYMBOL_${NAME} )
     
     SET (CHOOSE_SYMBOL_INCLUDES)
+    SET (CMAKE_REQUIRED_DEFINITIONS)
 ENDMACRO(CHOOSE_SYMBOL)

Modified: branches/lucene2_3_2/src/shared/cmake/MacroChooseType.cmake
===================================================================
--- branches/lucene2_3_2/src/shared/cmake/MacroChooseType.cmake	2008-08-18 16:54:13 UTC (rev 2871)
+++ branches/lucene2_3_2/src/shared/cmake/MacroChooseType.cmake	2008-08-22 08:54:36 UTC (rev 2872)
@@ -4,12 +4,11 @@
 
 #macro that sets OUTPUT as the value of oneof options (if _CL_HAVE_OPTION exists)
 MACRO(CHOOSE_TYPE name size sign options)
+    #note: don't add windows.h to this list, since we don't want to find things 
+    #in there (bcc might make you think otherwise, but it's true!)...
     IF ( HAVE_TCHAR_H )
     	SET (CMAKE_EXTRA_INCLUDE_FILES "${CMAKE_EXTRA_INCLUDE_FILES};tchar.h")
     ENDIF ( HAVE_TCHAR_H )
-    IF ( HAVE_WINDOWS_H )
-    	SET (CMAKE_EXTRA_INCLUDE_FILES "${CMAKE_EXTRA_INCLUDE_FILES};windows.h")
-    ENDIF ( HAVE_WINDOWS_H )
 
     STRING(TOUPPER ${name} NAME)
     FOREACH(option ${options})


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.