[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdesupport/strigi/src
From:       Christian Ehrlicher <Ch.Ehrlicher () gmx ! de>
Date:       2007-03-05 20:15:15
Message-ID: 1173125715.492401.8175.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 639714 by chehrlic:

some more win32 compile++

 M  +1 -1      streamindexer/cnstr.h  
 M  +32 -9     streams/CMakeLists.txt  
 M  +1 -0      streams/filestreamopener.cpp  
 M  +1 -0      streams/streambase.h  


--- trunk/kdesupport/strigi/src/streamindexer/cnstr.h #639713:639714
@@ -125,7 +125,7 @@
         return pos->first;
     }
     bool isInitialized() const {
-        return pos->first;
+        return (pos->first != NULL);
     }
     size_t length() const {
         return (pos->first) ? strlen(pos->first) :0;
--- trunk/kdesupport/strigi/src/streams/CMakeLists.txt #639713:639714
@@ -5,14 +5,35 @@
 	${strigi_BINARY_DIR}/src/streams/compat
 	${strigi_SOURCE_DIR}/src/streams/compat)
 
-set(streams_SRCS bz2inputstream.cpp
-	digestinputstream.cpp fileinputstream.cpp gzipinputstream.cpp
-	gzipcompressstream.cpp inputstreamreader.cpp filereader.cpp
-	subinputstream.cpp mailinputstream.cpp stringterminatedsubstream.cpp
-	tarinputstream.cpp zipinputstream.cpp base64inputstream.cpp
-	dostime.cpp substreamproviderprovider.cpp arinputstream.cpp
-	rpminputstream.cpp archivereader.cpp processinputstream.cpp
-	textutils.cpp kmpsearcher.cpp filestreamopener.cpp cpioinputstream.cpp)
+set(streams_SRCS
+	bz2inputstream.cpp
+	digestinputstream.cpp
+	fileinputstream.cpp
+	gzipinputstream.cpp
+	gzipcompressstream.cpp
+	inputstreamreader.cpp
+	filereader.cpp
+	subinputstream.cpp
+	mailinputstream.cpp
+	stringterminatedsubstream.cpp
+	tarinputstream.cpp
+	zipinputstream.cpp
+	base64inputstream.cpp
+	dostime.cpp
+	substreamproviderprovider.cpp
+	arinputstream.cpp
+	rpminputstream.cpp
+	archivereader.cpp
+	textutils.cpp
+	kmpsearcher.cpp
+	filestreamopener.cpp
+	cpioinputstream.cpp
+)
+if(NOT WIN32)
+set(streams_SRCS ${streams_SRCS}
+	processinputstream.cpp
+)
+endif(NOT WIN32)
 
 #add the compatibility files
 set(streams_SRCS ${streams_SRCS} compat/compat.cpp compat/fnmatch.cpp compat/stgdirent.cpp)
@@ -38,6 +59,8 @@
 	compat/timeofday.h compat/strigi_fnmatch.h compat/strigi_thread.h compat/stgdirent.h
 	DESTINATION include/strigi)
 
-add_executable(testpt testpt.cpp processinputstream.cpp)
+if(NOT WIN32)
+  add_executable(testpt testpt.cpp processinputstream.cpp)
+endif(NOT WIN32)
 
 add_executable(decodebase64 decodebase64.cpp base64inputstream.cpp)
--- trunk/kdesupport/strigi/src/streams/filestreamopener.cpp #639713:639714
@@ -17,6 +17,7 @@
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
+#include "jstreamsconfig.h"
 #include "archivereader.h"
 #include "fileinputstream.h"
 #include <sys/types.h>
--- trunk/kdesupport/strigi/src/streams/streambase.h #639713:639714
@@ -28,6 +28,7 @@
 #if _WIN32
 typedef __int64 int64_t;
 typedef int int32_t;
+typedef unsigned int uint;
 #endif
 
 namespace jstreams {
[prev in list] [next in list] [prev in thread] [next in thread]