[Libreoffice-commits] .: 5 commits - clucene/configs clucene/source distro-configs/LibreOfficeMinGW.conf fpicker/source sal/inc sal/systools

Jan Holesovsky kendy at kemper.freedesktop.org
Fri Feb 24 09:55:18 PST 2012


 clucene/configs/_clucene-config-LINUX.h                         |   30 -
 clucene/configs/_clucene-config-MSVC.h                          |  224 +++----
 clucene/configs/_clucene-config-generic.h                       |   30 -
 clucene/configs/clucene-config-MINGW.h                          |  148 +++++
 clucene/configs/clucene-config-MSVC.h                           |  296 +++++-----
 clucene/configs/clucene-config-generic.h                        |   40 -
 clucene/source/Makefile                                         |    6 
 distro-configs/LibreOfficeMinGW.conf                            |    1 
 fpicker/source/win32/filepicker/FPentry.cxx                     |    2 
 fpicker/source/win32/filepicker/VistaFilePicker.cxx             |    6 
 fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx |    6 
 fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx |    6 
 fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx         |    6 
 fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx         |    6 
 sal/inc/systools/win32/snprintf.h                               |    3 
 sal/systools/win32/uwinapi/sntprintf.c                          |    4 
 16 files changed, 487 insertions(+), 327 deletions(-)

New commits:
commit 3dee9ff1c938cbc2272772c1c6df6f11ef5bab0e
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Fri Feb 24 18:53:02 2012 +0100

    MinGW: Make clucene build.

diff --git a/clucene/configs/clucene-config-MINGW.h b/clucene/configs/clucene-config-MINGW.h
new file mode 100644
index 0000000..be6f487
--- /dev/null
+++ b/clucene/configs/clucene-config-MINGW.h
@@ -0,0 +1,148 @@
+#ifndef _SRC_CLUCENE_CLUCENE_CONFIG_H
+#define _SRC_CLUCENE_CLUCENE_CONFIG_H 1
+
+/* src/shared/CLucene/clucene-config.h.
+*  Generated automatically at end of cmake.
+*/
+
+/* CMake will look for these headers: */
+#define _CL_HAVE_STRING_H  1
+#define _CL_HAVE_MEMORY_H  1
+/* #undef _CL_HAVE_UNISTD_H */
+#define _CL_HAVE_IO_H  1
+#define _CL_HAVE_DIRECT_H  1
+/* #undef _CL_HAVE_DIRENT_H */
+/* #undef _CL_HAVE_SYS_DIR_H */
+/* #undef _CL_HAVE_SYS_NDIR_H */
+#define _CL_HAVE_ERRNO_H  1
+#define _CL_HAVE_WCHAR_H  1
+#define _CL_HAVE_WCTYPE_H
+#define _CL_HAVE_CTYPE_H  1
+#define _CL_HAVE_WINDOWS_H  1
+/* #undef _CL_HAVE_WINDEF_H */
+#define _CL_HAVE_SYS_TYPES_H  1
+/* #undef _CL_HAVE_DLFCN_H */
+/* #undef _CL_HAVE_EXT_HASH_MAP */
+/* #undef _CL_HAVE_EXT_HASH_SET */
+/* #undef _CL_HAVE_TR1_UNORDERED_MAP */
+/* #undef _CL_HAVE_TR1_UNORDERED_SET */
+/* #undef _CL_HAVE_HASH_MAP */
+/* #undef _CL_HAVE_HASH_SET */
+/* #undef _CL_HAVE_NDIR_H */
+#define _CL_HAVE_SYS_STAT_H  1
+#define _CL_HAVE_SYS_TIMEB_H  1
+/* #undef _CL_HAVE_SYS_TIME_H */
+#define _CL_HAVE_TCHAR_H 1
+/* #undef _CL_HAVE_SYS_MMAN_H */
+#define _CL_HAVE_WINERROR_H 1
+/* #undef _CL_HAVE_STDINT_H */
+
+// our needed types
+typedef signed char int8_t;
+typedef unsigned char uint8_t;
+typedef signed short int16_t;
+typedef unsigned short uint16_t;
+typedef signed int int32_t;
+typedef unsigned int uint32_t;
+typedef signed long long int64_t;
+typedef unsigned long long uint64_t;
+
+/* undef float_t*/
+typedef unsigned long _cl_dword_t;
+/* undef size_t size_t */
+
+/* tchar & _T definitions... */
+/* undef TCHAR TCHAR */
+/* #undef _T */
+
+/* CMake will determine these specifics. Things like bugs, etc */
+
+/* if we can't support the map/set hashing */
+/* #undef LUCENE_DISABLE_HASHING */
+
+/* Define if you have POSIX threads libraries and header files. */
+/* #undef _CL_HAVE_PTHREAD */
+
+/* Define if you have Win32 threads libraries and header files. */
+#define _CL_HAVE_WIN32_THREADS  1
+
+/* Define if we have gcc atomic functions */
+/* #undef _CL_HAVE_GCC_ATOMIC_FUNCTIONS */
+
+/* Define what eval method is required for float_t to be defined (for GCC). */
+/* #undef _FLT_EVAL_METHOD */
+
+/* If we use hashmaps, which namespace do we use: */
+#define CL_NS_HASHING(func)
+/* If we use hashmaps, which classes do we use: */
+#define _CL_HASH_MAP
+#define _CL_HASH_SET
+
+/* define if the compiler implements namespaces */
+#define _CL_HAVE_NAMESPACES
+
+/* Defined if the snprintf overflow test fails */
+/* #undef _CL_HAVE_SNPRINTF_BUG */
+
+/* Defined if the swprintf test fails */
+/* #undef _CL_HAVE_SNWPRINTF_BUG */
+
+/* How to define a static const in a class */
+#define LUCENE_STATIC_CONSTANT(type, assignment)  static const type assignment
+
+/* Define to the necessary symbol if this constant uses a non-standard name on
+   your system. */
+//todo: not checked
+/* #undef _CL_PTHREAD_CREATE_JOINABLE */
+
+/* Define to 1 if the `S_IS*' macros in <sys/stat.h> do not work properly. */
+//todo: not being checked for...
+/* #undef _CL_STAT_MACROS_BROKEN */
+
+/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
+//not actually used for anything...
+/* #undef _CL_TIME_WITH_SYS_TIME */
+
+/* Define that we will be using -fvisibility=hidden, and
+ * make public classes visible using __attribute__ ((visibility("default")))
+ */
+/* #undef _CL_HAVE_GCCVISIBILITYPATCH */
+
+
+/* Versions, etc */
+
+/* Name of package */
+#define _CL_PACKAGE  "clucene-core"
+
+/* Version number of package */
+#define _CL_VERSION  "2.3.3.4"
+
+/* So-Version number of package */
+#define _CL_SOVERSION  "1"
+
+/* A comparable version number */
+#define _CL_INT_VERSION  2030304
+
+/* Configured options (from command line) */
+
+/* Forces into Ascii mode */
+/* #undef _ASCII */
+
+/* Conditional Debugging */
+/* #undef _CL__CND_DEBUG */
+
+/* debuging option */
+/* #undef _DEBUG */
+
+/* Disable multithreading */
+/* #undef _CL_DISABLE_MULTITHREADING */
+
+
+#ifdef __BORLANDC__ //borland compiler
+    //todo: bcc incorrectly detects this... fix this in cmake
+    #undef LUCENE_STATIC_CONSTANT
+    #define LUCENE_STATIC_CONSTANT(type, assignment) enum { assignment }
+#endif
+
+
+#endif
diff --git a/clucene/source/Makefile b/clucene/source/Makefile
index f7672bc..2e06a84 100644
--- a/clucene/source/Makefile
+++ b/clucene/source/Makefile
@@ -51,10 +51,14 @@ ifneq ($(OS),WNT)
 	mv src/shared/CLucene/util/dirent.h inc/internal/CLucene/util
 endif
 	#To generate these, run cmake for each sufficiently different platform, customize and stick into configs
-ifeq ($(COM),MSC)
+ifeq ($(OS),WNT)
 	cp $(SRCDIR)/clucene/configs/_clucene-config-MSVC.h src/shared/CLucene/_clucene-config.h
+ifeq ($(COM),MSC)
 	cp $(SRCDIR)/clucene/configs/clucene-config-MSVC.h src/shared/CLucene/clucene-config.h
 else
+	cp $(SRCDIR)/clucene/configs/clucene-config-MINGW.h src/shared/CLucene/clucene-config.h
+endif
+else
 	cp $(SRCDIR)/clucene/configs/clucene-config-generic.h src/shared/CLucene/clucene-config.h
 ifeq ($(OS),LINUX)
 	cp $(SRCDIR)/clucene/configs/_clucene-config-LINUX.h src/shared/CLucene/_clucene-config.h
commit 65d9696da19ea68cb576c93f3101eb145e4a1370
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Fri Feb 24 18:51:50 2012 +0100

    Trailing whitespace cleanup in the clucene configs.

diff --git a/clucene/configs/_clucene-config-LINUX.h b/clucene/configs/_clucene-config-LINUX.h
index e887108..afea55c 100644
--- a/clucene/configs/_clucene-config-LINUX.h
+++ b/clucene/configs/_clucene-config-LINUX.h
@@ -1,7 +1,7 @@
 #ifndef _SRC_CLUCENE_INTERNAL_CLUCENE_CONFIG_H
 #define _SRC_CLUCENE_INTERNAL_CLUCENE_CONFIG_H 1
- 
-/* src/shared/CLucene/_clucene-config.h. 
+
+/* src/shared/CLucene/_clucene-config.h.
 *  Generated automatically at end of cmake.
 *  These are internal definitions, and this file does not need to be distributed
 */
@@ -10,16 +10,16 @@
 /* #undef _CL_HAVE_FUNCTION__VSNWPRINTF */
 /* #undef _CL_HAVE_FUNCTION__SNWPRINTF */
 #define _CL_HAVE_FUNCTION_WCSCASECMP
-#define _CL_HAVE_FUNCTION_WCSCAT  1 
-#define _CL_HAVE_FUNCTION_WCSCHR  1 
-#define _CL_HAVE_FUNCTION_WCSCMP  1 
-#define _CL_HAVE_FUNCTION_WCSCPY  1 
-#define _CL_HAVE_FUNCTION_WCSCSPN  1 
+#define _CL_HAVE_FUNCTION_WCSCAT  1
+#define _CL_HAVE_FUNCTION_WCSCHR  1
+#define _CL_HAVE_FUNCTION_WCSCMP  1
+#define _CL_HAVE_FUNCTION_WCSCPY  1
+#define _CL_HAVE_FUNCTION_WCSCSPN  1
 /* #undef _CL_HAVE_FUNCTION_WCSICMP */
-#define _CL_HAVE_FUNCTION_WCSLEN  1 
-#define _CL_HAVE_FUNCTION_WCSNCMP  1 
-#define _CL_HAVE_FUNCTION_WCSNCPY  1 
-#define _CL_HAVE_FUNCTION_WCSSTR  1 
+#define _CL_HAVE_FUNCTION_WCSLEN  1
+#define _CL_HAVE_FUNCTION_WCSNCMP  1
+#define _CL_HAVE_FUNCTION_WCSNCPY  1
+#define _CL_HAVE_FUNCTION_WCSSTR  1
 #define _CL_HAVE_FUNCTION_WCSTOD 1
 #define _CL_HAVE_FUNCTION_WCSDUP 1
 #define _CL_HAVE_FUNCTION_WCSTOLL 1
@@ -29,9 +29,9 @@
 
 /* #undef _CL_HAVE_FUNCTION_LLTOA */
 /* #undef _CL_HAVE_FUNCTION_LLTOW */
-#define _CL_HAVE_FUNCTION_PRINTF  1 
-#define _CL_HAVE_FUNCTION_SNPRINTF  1 
-#define _CL_HAVE_FUNCTION_MMAP  1 
+#define _CL_HAVE_FUNCTION_PRINTF  1
+#define _CL_HAVE_FUNCTION_SNPRINTF  1
+#define _CL_HAVE_FUNCTION_MMAP  1
 /* #undef _CL_HAVE_FUNCTION_STRLWR */
 #define _CL_HAVE_FUNCTION_STRTOLL 1
 /* #undef _CL_HAVE_FUNCTION_STRUPR */
@@ -80,7 +80,7 @@
 /* #undef _CL_HAVE_NO_FLOAT_BYTE */
 
 /* Define if recursive pthread mutexes are available */
-#define _CL_HAVE_PTHREAD_MUTEX_RECURSIVE  1 
+#define _CL_HAVE_PTHREAD_MUTEX_RECURSIVE  1
 
 /** define if you would like to force clucene to use the internal
 * character functions.
diff --git a/clucene/configs/_clucene-config-MSVC.h b/clucene/configs/_clucene-config-MSVC.h
index d97d8b7..aa8a93c 100644
--- a/clucene/configs/_clucene-config-MSVC.h
+++ b/clucene/configs/_clucene-config-MSVC.h
@@ -1,112 +1,112 @@
-#ifndef _SRC_CLUCENE_INTERNAL_CLUCENE_CONFIG_H
-#define _SRC_CLUCENE_INTERNAL_CLUCENE_CONFIG_H 1
- 
-/* src/shared/CLucene/_clucene-config.h. 
-*  Generated automatically at end of cmake.
-*  These are internal definitions, and this file does not need to be distributed
-*/
-
-/* CMake will look for these functions: */
-#define _CL_HAVE_FUNCTION__VSNWPRINTF
-#define _CL_HAVE_FUNCTION__SNWPRINTF
-/* #undef _CL_HAVE_FUNCTION_WCSCASECMP */
-#define _CL_HAVE_FUNCTION_WCSCAT  1 
-#define _CL_HAVE_FUNCTION_WCSCHR  1 
-#define _CL_HAVE_FUNCTION_WCSCMP  1 
-#define _CL_HAVE_FUNCTION_WCSCPY  1 
-#define _CL_HAVE_FUNCTION_WCSCSPN  1 
-#define _CL_HAVE_FUNCTION_WCSICMP
-#define _CL_HAVE_FUNCTION_WCSLEN  1 
-#define _CL_HAVE_FUNCTION_WCSNCMP  1 
-#define _CL_HAVE_FUNCTION_WCSNCPY  1 
-#define _CL_HAVE_FUNCTION_WCSSTR  1 
-#define _CL_HAVE_FUNCTION_WCSTOD 1
-#define _CL_HAVE_FUNCTION_WCSDUP 1
-/* #undef _CL_HAVE_FUNCTION_WCSTOLL */
-#define _CL_HAVE_FUNCTION_WCSUPR 1
-/* #undef _CL_HAVE_FUNCTION_GETTIMEOFDAY */
-#define _CL_HAVE_FUNCTION_MAPVIEWOFFILE 1
-
-/* #undef _CL_HAVE_FUNCTION_LLTOA */
-/* #undef _CL_HAVE_FUNCTION_LLTOW */
-#define _CL_HAVE_FUNCTION_PRINTF  1 
-/* #undef _CL_HAVE_FUNCTION_SNPRINTF */
-/* #undef _CL_HAVE_FUNCTION_MMAP */
-#define _CL_HAVE_FUNCTION_STRLWR 1
-/* #undef _CL_HAVE_FUNCTION_STRTOLL */
-#define _CL_HAVE_FUNCTION_STRUPR 1
-/* #undef _CL_HAVE_FUNCTION_GETPAGESIZE */
-/* #undef _CL_HAVE_FUNCTION_USLEEP */
-#define _CL_HAVE_FUNCTION_SLEEP 1
-
-#define CL_MAX_PATH 4096
-//this is the max filename... for now its just the same,
-//but this could change, so we use a different name
-#define CL_MAX_NAME CL_MAX_PATH
-//this used to be CL_MAX_NAME * 32, but as Alex Hudson points out, this could come to be 128kb.
-//the above logic for CL_MAX_NAME should be correct enough to handle all file names
-#define CL_MAX_DIR CL_MAX_PATH
-
-/* undef _O_RANDOM _O_RANDOM */
-/* undef _O_BINARY _O_BINARY */
-/* undef _S_IREAD _S_IREAD */
-/* undef _S_IWRITE _S_IWRITE */
-/* #undef _timeb */
-
-#define _ILONG(x) x ## L
-#define _ILONGLONG(x) x ## LL
-
-#define fileStat _stati64
-#define cl_stat_t _stati64
-#define fileSize _filelengthi64
-#define fileSeek _lseeki64
-#define fileTell _telli64
-#define fileHandleStat _fstati64
-#define _realpath(rel,abs) ::_fullpath(abs,rel,CL_MAX_PATH)
-#define _rename rename
-/* undef _close _close */
-/* undef _read _read */
-#define _cl_open _open
-/* undef _write _write */
-/* undef _snprintf _snprintf */
-/* undef _mkdir _mkdir */
-/* undef _unlink _unlink */
-/* undef _ftime _ftime */
-#define SLEEPFUNCTION Sleep
-
-/* CMake will determine these specifics. Things like bugs, etc */
-
-/* Does not support new float byte<->float conversions */
-/* #undef _CL_HAVE_NO_FLOAT_BYTE */
-
-/* Define if recursive pthread mutexes are available */
-/* #undef _CL_HAVE_PTHREAD_MUTEX_RECURSIVE */
-
-/** define if you would like to force clucene to use the internal
-* character functions.
-* Tests may display unpredictable behaviour if this is not defined.
-*/
-#ifndef LUCENE_USE_INTERNAL_CHAR_FUNCTIONS
-	#define LUCENE_USE_INTERNAL_CHAR_FUNCTIONS 1
-#endif
-
-/** fix ansi for loop scope */
-#if 1==0
- #define for if (0); else for
-#endif
-
-
-/* Compiler oddities */
-
-//not sure why, but cygwin reports _S_IREAD, but doesn't actually work...
-//TODO: make this work properly (this bit shouldn't be necessary)
-#ifdef __CYGWIN__
-    #define _S_IREAD 0333
-    #define _S_IWRITE 0333
-#endif
-
-#ifdef __BORLANDC__ //borland compiler
-    #define O_RANDOM 0
-#endif
-
-#endif
+#ifndef _SRC_CLUCENE_INTERNAL_CLUCENE_CONFIG_H
+#define _SRC_CLUCENE_INTERNAL_CLUCENE_CONFIG_H 1
+
+/* src/shared/CLucene/_clucene-config.h.
+*  Generated automatically at end of cmake.
+*  These are internal definitions, and this file does not need to be distributed
+*/
+
+/* CMake will look for these functions: */
+#define _CL_HAVE_FUNCTION__VSNWPRINTF
+#define _CL_HAVE_FUNCTION__SNWPRINTF
+/* #undef _CL_HAVE_FUNCTION_WCSCASECMP */
+#define _CL_HAVE_FUNCTION_WCSCAT  1
+#define _CL_HAVE_FUNCTION_WCSCHR  1
+#define _CL_HAVE_FUNCTION_WCSCMP  1
+#define _CL_HAVE_FUNCTION_WCSCPY  1
+#define _CL_HAVE_FUNCTION_WCSCSPN  1
+#define _CL_HAVE_FUNCTION_WCSICMP
+#define _CL_HAVE_FUNCTION_WCSLEN  1
+#define _CL_HAVE_FUNCTION_WCSNCMP  1
+#define _CL_HAVE_FUNCTION_WCSNCPY  1
+#define _CL_HAVE_FUNCTION_WCSSTR  1
+#define _CL_HAVE_FUNCTION_WCSTOD 1
+#define _CL_HAVE_FUNCTION_WCSDUP 1
+/* #undef _CL_HAVE_FUNCTION_WCSTOLL */
+#define _CL_HAVE_FUNCTION_WCSUPR 1
+/* #undef _CL_HAVE_FUNCTION_GETTIMEOFDAY */
+#define _CL_HAVE_FUNCTION_MAPVIEWOFFILE 1
+
+/* #undef _CL_HAVE_FUNCTION_LLTOA */
+/* #undef _CL_HAVE_FUNCTION_LLTOW */
+#define _CL_HAVE_FUNCTION_PRINTF  1
+/* #undef _CL_HAVE_FUNCTION_SNPRINTF */
+/* #undef _CL_HAVE_FUNCTION_MMAP */
+#define _CL_HAVE_FUNCTION_STRLWR 1
+/* #undef _CL_HAVE_FUNCTION_STRTOLL */
+#define _CL_HAVE_FUNCTION_STRUPR 1
+/* #undef _CL_HAVE_FUNCTION_GETPAGESIZE */
+/* #undef _CL_HAVE_FUNCTION_USLEEP */
+#define _CL_HAVE_FUNCTION_SLEEP 1
+
+#define CL_MAX_PATH 4096
+//this is the max filename... for now its just the same,
+//but this could change, so we use a different name
+#define CL_MAX_NAME CL_MAX_PATH
+//this used to be CL_MAX_NAME * 32, but as Alex Hudson points out, this could come to be 128kb.
+//the above logic for CL_MAX_NAME should be correct enough to handle all file names
+#define CL_MAX_DIR CL_MAX_PATH
+
+/* undef _O_RANDOM _O_RANDOM */
+/* undef _O_BINARY _O_BINARY */
+/* undef _S_IREAD _S_IREAD */
+/* undef _S_IWRITE _S_IWRITE */
+/* #undef _timeb */
+
+#define _ILONG(x) x ## L
+#define _ILONGLONG(x) x ## LL
+
+#define fileStat _stati64
+#define cl_stat_t _stati64
+#define fileSize _filelengthi64
+#define fileSeek _lseeki64
+#define fileTell _telli64
+#define fileHandleStat _fstati64
+#define _realpath(rel,abs) ::_fullpath(abs,rel,CL_MAX_PATH)
+#define _rename rename
+/* undef _close _close */
+/* undef _read _read */
+#define _cl_open _open
+/* undef _write _write */
+/* undef _snprintf _snprintf */
+/* undef _mkdir _mkdir */
+/* undef _unlink _unlink */
+/* undef _ftime _ftime */
+#define SLEEPFUNCTION Sleep
+
+/* CMake will determine these specifics. Things like bugs, etc */
+
+/* Does not support new float byte<->float conversions */
+/* #undef _CL_HAVE_NO_FLOAT_BYTE */
+
+/* Define if recursive pthread mutexes are available */
+/* #undef _CL_HAVE_PTHREAD_MUTEX_RECURSIVE */
+
+/** define if you would like to force clucene to use the internal
+* character functions.
+* Tests may display unpredictable behaviour if this is not defined.
+*/
+#ifndef LUCENE_USE_INTERNAL_CHAR_FUNCTIONS
+	#define LUCENE_USE_INTERNAL_CHAR_FUNCTIONS 1
+#endif
+
+/** fix ansi for loop scope */
+#if 1==0
+ #define for if (0); else for
+#endif
+
+
+/* Compiler oddities */
+
+//not sure why, but cygwin reports _S_IREAD, but doesn't actually work...
+//TODO: make this work properly (this bit shouldn't be necessary)
+#ifdef __CYGWIN__
+    #define _S_IREAD 0333
+    #define _S_IWRITE 0333
+#endif
+
+#ifdef __BORLANDC__ //borland compiler
+    #define O_RANDOM 0
+#endif
+
+#endif
diff --git a/clucene/configs/_clucene-config-generic.h b/clucene/configs/_clucene-config-generic.h
index a516b60..a9fb331 100644
--- a/clucene/configs/_clucene-config-generic.h
+++ b/clucene/configs/_clucene-config-generic.h
@@ -1,7 +1,7 @@
 #ifndef _SRC_CLUCENE_INTERNAL_CLUCENE_CONFIG_H
 #define _SRC_CLUCENE_INTERNAL_CLUCENE_CONFIG_H 1
- 
-/* src/shared/CLucene/_clucene-config.h. 
+
+/* src/shared/CLucene/_clucene-config.h.
 *  Generated automatically at end of cmake.
 *  These are internal definitions, and this file does not need to be distributed
 */
@@ -10,16 +10,16 @@
 /* #undef _CL_HAVE_FUNCTION__VSNWPRINTF */
 /* #undef _CL_HAVE_FUNCTION__SNWPRINTF */
 #define _CL_HAVE_FUNCTION_WCSCASECMP
-#define _CL_HAVE_FUNCTION_WCSCAT  1 
-#define _CL_HAVE_FUNCTION_WCSCHR  1 
-#define _CL_HAVE_FUNCTION_WCSCMP  1 
-#define _CL_HAVE_FUNCTION_WCSCPY  1 
-#define _CL_HAVE_FUNCTION_WCSCSPN  1 
+#define _CL_HAVE_FUNCTION_WCSCAT  1
+#define _CL_HAVE_FUNCTION_WCSCHR  1
+#define _CL_HAVE_FUNCTION_WCSCMP  1
+#define _CL_HAVE_FUNCTION_WCSCPY  1
+#define _CL_HAVE_FUNCTION_WCSCSPN  1
 /* #undef _CL_HAVE_FUNCTION_WCSICMP */
-#define _CL_HAVE_FUNCTION_WCSLEN  1 
-#define _CL_HAVE_FUNCTION_WCSNCMP  1 
-#define _CL_HAVE_FUNCTION_WCSNCPY  1 
-#define _CL_HAVE_FUNCTION_WCSSTR  1 
+#define _CL_HAVE_FUNCTION_WCSLEN  1
+#define _CL_HAVE_FUNCTION_WCSNCMP  1
+#define _CL_HAVE_FUNCTION_WCSNCPY  1
+#define _CL_HAVE_FUNCTION_WCSSTR  1
 #define _CL_HAVE_FUNCTION_WCSTOD 1
 /* #undef _CL_HAVE_FUNCTION_WCSDUP 1 */
 #define _CL_HAVE_FUNCTION_WCSTOLL 1
@@ -29,9 +29,9 @@
 
 /* #undef _CL_HAVE_FUNCTION_LLTOA */
 /* #undef _CL_HAVE_FUNCTION_LLTOW */
-#define _CL_HAVE_FUNCTION_PRINTF  1 
-#define _CL_HAVE_FUNCTION_SNPRINTF  1 
-#define _CL_HAVE_FUNCTION_MMAP  1 
+#define _CL_HAVE_FUNCTION_PRINTF  1
+#define _CL_HAVE_FUNCTION_SNPRINTF  1
+#define _CL_HAVE_FUNCTION_MMAP  1
 /* #undef _CL_HAVE_FUNCTION_STRLWR */
 #define _CL_HAVE_FUNCTION_STRTOLL 1
 /* #undef _CL_HAVE_FUNCTION_STRUPR */
@@ -80,7 +80,7 @@
 /* #undef _CL_HAVE_NO_FLOAT_BYTE */
 
 /* Define if recursive pthread mutexes are available */
-#define _CL_HAVE_PTHREAD_MUTEX_RECURSIVE  1 
+#define _CL_HAVE_PTHREAD_MUTEX_RECURSIVE  1
 
 /** define if you would like to force clucene to use the internal
 * character functions.
diff --git a/clucene/configs/clucene-config-MSVC.h b/clucene/configs/clucene-config-MSVC.h
index b12c20b..da7d37f 100644
--- a/clucene/configs/clucene-config-MSVC.h
+++ b/clucene/configs/clucene-config-MSVC.h
@@ -1,148 +1,148 @@
-#ifndef _SRC_CLUCENE_CLUCENE_CONFIG_H
-#define _SRC_CLUCENE_CLUCENE_CONFIG_H 1
- 
-/* src/shared/CLucene/clucene-config.h. 
-*  Generated automatically at end of cmake.
-*/
-
-/* CMake will look for these headers: */
-#define _CL_HAVE_STRING_H  1
-#define _CL_HAVE_MEMORY_H  1 
-/* #undef _CL_HAVE_UNISTD_H */
-#define _CL_HAVE_IO_H  1 
-#define _CL_HAVE_DIRECT_H  1 
-/* #undef _CL_HAVE_DIRENT_H */
-/* #undef _CL_HAVE_SYS_DIR_H */
-/* #undef _CL_HAVE_SYS_NDIR_H */
-#define _CL_HAVE_ERRNO_H  1 
-#define _CL_HAVE_WCHAR_H  1 
-#define _CL_HAVE_WCTYPE_H   
-#define _CL_HAVE_CTYPE_H  1 
-#define _CL_HAVE_WINDOWS_H  1 
-/* #undef _CL_HAVE_WINDEF_H */
-#define _CL_HAVE_SYS_TYPES_H  1 
-/* #undef _CL_HAVE_DLFCN_H */
-/* #undef _CL_HAVE_EXT_HASH_MAP */
-/* #undef _CL_HAVE_EXT_HASH_SET */
-/* #undef _CL_HAVE_TR1_UNORDERED_MAP */
-/* #undef _CL_HAVE_TR1_UNORDERED_SET */
-/* #undef _CL_HAVE_HASH_MAP */
-/* #undef _CL_HAVE_HASH_SET */
-/* #undef _CL_HAVE_NDIR_H */
-#define _CL_HAVE_SYS_STAT_H  1 
-#define _CL_HAVE_SYS_TIMEB_H  1 
-/* #undef _CL_HAVE_SYS_TIME_H */
-#define _CL_HAVE_TCHAR_H 1
-/* #undef _CL_HAVE_SYS_MMAN_H */
-#define _CL_HAVE_WINERROR_H 1
-/* #undef _CL_HAVE_STDINT_H */
-
-// our needed types
-typedef signed char int8_t;
-typedef unsigned char uint8_t;
-typedef signed short int16_t;
-typedef unsigned short uint16_t;
-typedef signed int int32_t;
-typedef unsigned int uint32_t;
-typedef signed long long int64_t;
-typedef unsigned long long uint64_t;
-
-typedef double float_t;
-typedef unsigned long _cl_dword_t;
-/* undef size_t size_t */
-
-/* tchar & _T definitions... */
-/* undef TCHAR TCHAR */
-/* #undef _T */
-
-/* CMake will determine these specifics. Things like bugs, etc */
-
-/* if we can't support the map/set hashing */
-/* #undef LUCENE_DISABLE_HASHING */
-
-/* Define if you have POSIX threads libraries and header files. */
-/* #undef _CL_HAVE_PTHREAD */
-
-/* Define if you have Win32 threads libraries and header files. */
-#define _CL_HAVE_WIN32_THREADS  1 
-
-/* Define if we have gcc atomic functions */
-/* #undef _CL_HAVE_GCC_ATOMIC_FUNCTIONS */
-
-/* Define what eval method is required for float_t to be defined (for GCC). */
-/* #undef _FLT_EVAL_METHOD */
-
-/* If we use hashmaps, which namespace do we use: */
-#define CL_NS_HASHING(func) 
-/* If we use hashmaps, which classes do we use: */
-#define _CL_HASH_MAP 
-#define _CL_HASH_SET 
-
-/* define if the compiler implements namespaces */
-#define _CL_HAVE_NAMESPACES   
-
-/* Defined if the snprintf overflow test fails */
-/* #undef _CL_HAVE_SNPRINTF_BUG */
-
-/* Defined if the swprintf test fails */
-/* #undef _CL_HAVE_SNWPRINTF_BUG */
-
-/* How to define a static const in a class */
-#define LUCENE_STATIC_CONSTANT(type, assignment)  static const type assignment
-
-/* Define to the necessary symbol if this constant uses a non-standard name on
-   your system. */
-//todo: not checked
-/* #undef _CL_PTHREAD_CREATE_JOINABLE */
-
-/* Define to 1 if the `S_IS*' macros in <sys/stat.h> do not work properly. */
-//todo: not being checked for...
-/* #undef _CL_STAT_MACROS_BROKEN */
-
-/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
-//not actually used for anything...
-/* #undef _CL_TIME_WITH_SYS_TIME */
-
-/* Define that we will be using -fvisibility=hidden, and 
- * make public classes visible using __attribute__ ((visibility("default")))
- */
-/* #undef _CL_HAVE_GCCVISIBILITYPATCH */
-
-
-/* Versions, etc */
-
-/* Name of package */
-#define _CL_PACKAGE  "clucene-core" 
-
-/* Version number of package */
-#define _CL_VERSION  "2.3.3.4"
-
-/* So-Version number of package */
-#define _CL_SOVERSION  "1"
-
-/* A comparable version number */
-#define _CL_INT_VERSION  2030304
-
-/* Configured options (from command line) */
-
-/* Forces into Ascii mode */
-/* #undef _ASCII */
-
-/* Conditional Debugging */
-/* #undef _CL__CND_DEBUG */
-
-/* debuging option */
-/* #undef _DEBUG */
-
-/* Disable multithreading */
-/* #undef _CL_DISABLE_MULTITHREADING */
-
-
-#ifdef __BORLANDC__ //borland compiler
-    //todo: bcc incorrectly detects this... fix this in cmake
-    #undef LUCENE_STATIC_CONSTANT
-    #define LUCENE_STATIC_CONSTANT(type, assignment) enum { assignment }
-#endif
-
-
-#endif
+#ifndef _SRC_CLUCENE_CLUCENE_CONFIG_H
+#define _SRC_CLUCENE_CLUCENE_CONFIG_H 1
+
+/* src/shared/CLucene/clucene-config.h.
+*  Generated automatically at end of cmake.
+*/
+
+/* CMake will look for these headers: */
+#define _CL_HAVE_STRING_H  1
+#define _CL_HAVE_MEMORY_H  1
+/* #undef _CL_HAVE_UNISTD_H */
+#define _CL_HAVE_IO_H  1
+#define _CL_HAVE_DIRECT_H  1
+/* #undef _CL_HAVE_DIRENT_H */
+/* #undef _CL_HAVE_SYS_DIR_H */
+/* #undef _CL_HAVE_SYS_NDIR_H */
+#define _CL_HAVE_ERRNO_H  1
+#define _CL_HAVE_WCHAR_H  1
+#define _CL_HAVE_WCTYPE_H
+#define _CL_HAVE_CTYPE_H  1
+#define _CL_HAVE_WINDOWS_H  1
+/* #undef _CL_HAVE_WINDEF_H */
+#define _CL_HAVE_SYS_TYPES_H  1
+/* #undef _CL_HAVE_DLFCN_H */
+/* #undef _CL_HAVE_EXT_HASH_MAP */
+/* #undef _CL_HAVE_EXT_HASH_SET */
+/* #undef _CL_HAVE_TR1_UNORDERED_MAP */
+/* #undef _CL_HAVE_TR1_UNORDERED_SET */
+/* #undef _CL_HAVE_HASH_MAP */
+/* #undef _CL_HAVE_HASH_SET */
+/* #undef _CL_HAVE_NDIR_H */
+#define _CL_HAVE_SYS_STAT_H  1
+#define _CL_HAVE_SYS_TIMEB_H  1
+/* #undef _CL_HAVE_SYS_TIME_H */
+#define _CL_HAVE_TCHAR_H 1
+/* #undef _CL_HAVE_SYS_MMAN_H */
+#define _CL_HAVE_WINERROR_H 1
+/* #undef _CL_HAVE_STDINT_H */
+
+// our needed types
+typedef signed char int8_t;
+typedef unsigned char uint8_t;
+typedef signed short int16_t;
+typedef unsigned short uint16_t;
+typedef signed int int32_t;
+typedef unsigned int uint32_t;
+typedef signed long long int64_t;
+typedef unsigned long long uint64_t;
+
+typedef double float_t;
+typedef unsigned long _cl_dword_t;
+/* undef size_t size_t */
+
+/* tchar & _T definitions... */
+/* undef TCHAR TCHAR */
+/* #undef _T */
+
+/* CMake will determine these specifics. Things like bugs, etc */
+
+/* if we can't support the map/set hashing */
+/* #undef LUCENE_DISABLE_HASHING */
+
+/* Define if you have POSIX threads libraries and header files. */
+/* #undef _CL_HAVE_PTHREAD */
+
+/* Define if you have Win32 threads libraries and header files. */
+#define _CL_HAVE_WIN32_THREADS  1
+
+/* Define if we have gcc atomic functions */
+/* #undef _CL_HAVE_GCC_ATOMIC_FUNCTIONS */
+
+/* Define what eval method is required for float_t to be defined (for GCC). */
+/* #undef _FLT_EVAL_METHOD */
+
+/* If we use hashmaps, which namespace do we use: */
+#define CL_NS_HASHING(func)
+/* If we use hashmaps, which classes do we use: */
+#define _CL_HASH_MAP
+#define _CL_HASH_SET
+
+/* define if the compiler implements namespaces */
+#define _CL_HAVE_NAMESPACES
+
+/* Defined if the snprintf overflow test fails */
+/* #undef _CL_HAVE_SNPRINTF_BUG */
+
+/* Defined if the swprintf test fails */
+/* #undef _CL_HAVE_SNWPRINTF_BUG */
+
+/* How to define a static const in a class */
+#define LUCENE_STATIC_CONSTANT(type, assignment)  static const type assignment
+
+/* Define to the necessary symbol if this constant uses a non-standard name on
+   your system. */
+//todo: not checked
+/* #undef _CL_PTHREAD_CREATE_JOINABLE */
+
+/* Define to 1 if the `S_IS*' macros in <sys/stat.h> do not work properly. */
+//todo: not being checked for...
+/* #undef _CL_STAT_MACROS_BROKEN */
+
+/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
+//not actually used for anything...
+/* #undef _CL_TIME_WITH_SYS_TIME */
+
+/* Define that we will be using -fvisibility=hidden, and
+ * make public classes visible using __attribute__ ((visibility("default")))
+ */
+/* #undef _CL_HAVE_GCCVISIBILITYPATCH */
+
+
+/* Versions, etc */
+
+/* Name of package */
+#define _CL_PACKAGE  "clucene-core"
+
+/* Version number of package */
+#define _CL_VERSION  "2.3.3.4"
+
+/* So-Version number of package */
+#define _CL_SOVERSION  "1"
+
+/* A comparable version number */
+#define _CL_INT_VERSION  2030304
+
+/* Configured options (from command line) */
+
+/* Forces into Ascii mode */
+/* #undef _ASCII */
+
+/* Conditional Debugging */
+/* #undef _CL__CND_DEBUG */
+
+/* debuging option */
+/* #undef _DEBUG */
+
+/* Disable multithreading */
+/* #undef _CL_DISABLE_MULTITHREADING */
+
+
+#ifdef __BORLANDC__ //borland compiler
+    //todo: bcc incorrectly detects this... fix this in cmake
+    #undef LUCENE_STATIC_CONSTANT
+    #define LUCENE_STATIC_CONSTANT(type, assignment) enum { assignment }
+#endif
+
+
+#endif
diff --git a/clucene/configs/clucene-config-generic.h b/clucene/configs/clucene-config-generic.h
index 6b985db..4dc8390 100644
--- a/clucene/configs/clucene-config-generic.h
+++ b/clucene/configs/clucene-config-generic.h
@@ -1,36 +1,36 @@
 #ifndef _SRC_CLUCENE_CLUCENE_CONFIG_H
 #define _SRC_CLUCENE_CLUCENE_CONFIG_H 1
- 
-/* src/shared/CLucene/clucene-config.h. 
+
+/* src/shared/CLucene/clucene-config.h.
 *  Generated automatically at end of cmake.
 */
 
 /* CMake will look for these headers: */
 #define _CL_HAVE_STRING_H  1
-#define _CL_HAVE_MEMORY_H  1 
-#define _CL_HAVE_UNISTD_H  1 
+#define _CL_HAVE_MEMORY_H  1
+#define _CL_HAVE_UNISTD_H  1
 /* #undef _CL_HAVE_IO_H */
 /* #undef _CL_HAVE_DIRECT_H */
-#define _CL_HAVE_DIRENT_H  1 
+#define _CL_HAVE_DIRENT_H  1
 #define _CL_HAVE_SYS_DIR_H
 /* #undef _CL_HAVE_SYS_NDIR_H */
-#define _CL_HAVE_ERRNO_H  1 
-#define _CL_HAVE_WCHAR_H  1 
-#define _CL_HAVE_WCTYPE_H   
-#define _CL_HAVE_CTYPE_H  1 
+#define _CL_HAVE_ERRNO_H  1
+#define _CL_HAVE_WCHAR_H  1
+#define _CL_HAVE_WCTYPE_H
+#define _CL_HAVE_CTYPE_H  1
 /* #undef _CL_HAVE_WINDOWS_H */
 /* #undef _CL_HAVE_WINDEF_H */
-#define _CL_HAVE_SYS_TYPES_H  1 
+#define _CL_HAVE_SYS_TYPES_H  1
 /* #undef _CL_HAVE_DLFCN_H */
-#define _CL_HAVE_EXT_HASH_MAP  1 
+#define _CL_HAVE_EXT_HASH_MAP  1
 /* #undef _CL_HAVE_EXT_HASH_SET */
-#define _CL_HAVE_TR1_UNORDERED_MAP 1 
-#define _CL_HAVE_TR1_UNORDERED_SET  1 
+#define _CL_HAVE_TR1_UNORDERED_MAP 1
+#define _CL_HAVE_TR1_UNORDERED_SET  1
 #define _CL_HAVE_HASH_MAP
 #define _CL_HAVE_HASH_SET
 /* #undef _CL_HAVE_NDIR_H */
-#define _CL_HAVE_SYS_STAT_H  1 
-#define _CL_HAVE_SYS_TIMEB_H  1 
+#define _CL_HAVE_SYS_STAT_H  1
+#define _CL_HAVE_SYS_TIMEB_H  1
 #define _CL_HAVE_SYS_TIME_H 1
 /* #undef _CL_HAVE_TCHAR_H */
 #define _CL_HAVE_SYS_MMAN_H 1
@@ -61,7 +61,7 @@ typedef  wchar_t TCHAR;
 /* #undef LUCENE_DISABLE_HASHING */
 
 /* Define if you have POSIX threads libraries and header files. */
-#define _CL_HAVE_PTHREAD  1 
+#define _CL_HAVE_PTHREAD  1
 
 /* Define if you have Win32 threads libraries and header files. */
 /* #undef _CL_HAVE_WIN32_THREADS */
@@ -79,7 +79,7 @@ typedef  wchar_t TCHAR;
 #define _CL_HASH_SET unordered_set
 
 /* define if the compiler implements namespaces */
-#define _CL_HAVE_NAMESPACES   
+#define _CL_HAVE_NAMESPACES
 
 /* Defined if the snprintf overflow test fails */
 /* #undef _CL_HAVE_SNPRINTF_BUG */
@@ -101,9 +101,9 @@ typedef  wchar_t TCHAR;
 
 /* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
 //not actually used for anything...
-//#define _CL_TIME_WITH_SYS_TIME  1 
+//#define _CL_TIME_WITH_SYS_TIME  1
 
-/* Define that we will be using -fvisibility=hidden, and 
+/* Define that we will be using -fvisibility=hidden, and
  * make public classes visible using __attribute__ ((visibility("default")))
  */
 #define _CL_HAVE_GCCVISIBILITYPATCH 1
@@ -112,7 +112,7 @@ typedef  wchar_t TCHAR;
 /* Versions, etc */
 
 /* Name of package */
-#define _CL_PACKAGE  "clucene-core" 
+#define _CL_PACKAGE  "clucene-core"
 
 /* Version number of package */
 #define _CL_VERSION  "2.3.3.4"
commit 330c38edfb2ba1c794166c0d885074b248198da2
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Fri Feb 24 18:36:20 2012 +0100

    MinGW: IFileDialog is present, but IFileDialogCustomize is still missing.

diff --git a/fpicker/source/win32/filepicker/FPentry.cxx b/fpicker/source/win32/filepicker/FPentry.cxx
index c45b69e..8213a57 100644
--- a/fpicker/source/win32/filepicker/FPentry.cxx
+++ b/fpicker/source/win32/filepicker/FPentry.cxx
@@ -65,7 +65,7 @@ static Reference< XInterface > SAL_CALL createInstance(
 {
     Reference< XInterface > xDlg;
 
-#ifdef __IFileDialog_INTERFACE_DEFINED__
+#ifdef __IFileDialogCustomize_INTERFACE_DEFINED__
     bool                    bVistaOrNewer = IsWindowsVistaOrNewer();
 
     if (bVistaOrNewer)
diff --git a/fpicker/source/win32/filepicker/VistaFilePicker.cxx b/fpicker/source/win32/filepicker/VistaFilePicker.cxx
index 9607963..144be50 100644
--- a/fpicker/source/win32/filepicker/VistaFilePicker.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePicker.cxx
@@ -37,8 +37,8 @@
 
 #include "VistaFilePicker.hxx"
 
-// Without IFileDialog we can't do much
-#ifdef __IFileDialog_INTERFACE_DEFINED__
+// Without IFileDialogCustomize we can't do much
+#ifdef __IFileDialogCustomize_INTERFACE_DEFINED__
 
 #include "WinFileOpenImpl.hxx"
 #include "../misc/WinImplHelper.hxx"
@@ -717,6 +717,6 @@ css::uno::Sequence< ::rtl::OUString > SAL_CALL VistaFilePicker::getSupportedServ
 } // namespace win32
 } // namespace fpicker
 
-#endif // __IFileDialog_INTERFACE_DEFINED__
+#endif // __IFileDialogCustomize_INTERFACE_DEFINED__
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx
index a008e1a..48f349a 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx
@@ -29,8 +29,8 @@
 
 #include "VistaFilePickerEventHandler.hxx"
 
-// Without IFileDialog we can't do much
-#ifdef __IFileDialog_INTERFACE_DEFINED__
+// Without IFileDialogCustomize we can't do much
+#ifdef __IFileDialogCustomize_INTERFACE_DEFINED__
 
 #include "asyncrequests.hxx"
 
@@ -463,6 +463,6 @@ void VistaFilePickerEventHandler::impl_sendEvent(  EEventType eEventType,
 } // namespace win32
 } // namespace fpicker
 
-#endif // __IFileDialog_INTERFACE_DEFINED__
+#endif // __IFileDialogCustomize_INTERFACE_DEFINED__
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx
index d86755f..76e6805 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx
@@ -39,8 +39,8 @@
 
 #include <shobjidl.h>
 
-// Without IFileDialog we can't do this
-#ifdef __IFileDialog_INTERFACE_DEFINED__
+// Without IFileDialogCustomize we can't do this
+#ifdef __IFileDialogCustomize_INTERFACE_DEFINED__
 
 #include "comptr.hxx"
 #include "vistatypes.h"
@@ -226,7 +226,7 @@ class VistaFilePickerEventHandler : public ::cppu::BaseMutex
 
 #undef css
 
-#endif // __IFileDialog_INTERFACE_DEFINED__
+#endif // __IFileDialogCustomize_INTERFACE_DEFINED__
 
 #endif  // FPICKER_WIN32_VISTA_FILEPICKER_EVENTHANDLER_HXX
 
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
index 2777662..b7337ab 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
@@ -32,8 +32,8 @@
 
 #include "VistaFilePickerImpl.hxx"
 
-// Without IFileDialog we can't do much
-#ifdef __IFileDialog_INTERFACE_DEFINED__
+// Without IFileDialogCustomize we can't do much
+#ifdef __IFileDialogCustomize_INTERFACE_DEFINED__
 
 #include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
 #include <com/sun/star/ui/dialogs/ControlActions.hpp>
@@ -1269,6 +1269,6 @@ bool VistaFilePickerImpl::onFileTypeChanged( UINT /*nTypeIndex*/ )
 } // namespace win32
 } // namespace fpicker
 
-#endif // __IFileDialog_INTERFACE_DEFINED__
+#endif // __IFileDialogCustomize_INTERFACE_DEFINED__
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx b/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx
index 174881a..a8a07a2 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx
@@ -47,8 +47,8 @@
 #pragma warning(pop)
 #endif
 
-// Without IFileDialog we can't do this
-#ifdef __IFileDialog_INTERFACE_DEFINED__
+// Without IFileDialogCustomize we can't do this
+#ifdef __IFileDialogCustomize_INTERFACE_DEFINED__
 
 #include "asyncrequests.hxx"
 #include "comptr.hxx"
@@ -365,7 +365,7 @@ class VistaFilePickerImpl : private ::cppu::BaseMutex
 
 #undef css
 
-#endif // __IFileDialog_INTERFACE_DEFINED__
+#endif // __IFileDialogCustomize_INTERFACE_DEFINED__
 
 #endif // FPICKER_WIN32_VISTA_FILEPICKERIMPL_HXX
 
commit 6cd8586f2332f2d8a87221452719c33ee0bb9d06
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Fri Feb 24 18:35:17 2012 +0100

    MinGW: snprintf might be present.

diff --git a/sal/inc/systools/win32/snprintf.h b/sal/inc/systools/win32/snprintf.h
index cfed10f..fe4f5de 100644
--- a/sal/inc/systools/win32/snprintf.h
+++ b/sal/inc/systools/win32/snprintf.h
@@ -49,6 +49,7 @@ extern "C" {
     enough to hold the string. */
 
 
+#if !defined(__MINGW32__) || defined (__NO_ISOCEXT)
 
 /* UNICODE version */
 _SNPRINTF_DLLIMPORT int __cdecl snwprintf( wchar_t *buffer, size_t count, const wchar_t *format, ... );
@@ -56,6 +57,8 @@ _SNPRINTF_DLLIMPORT int __cdecl snwprintf( wchar_t *buffer, size_t count, const
 /* SBCS and MBCS version */
 _SNPRINTF_DLLIMPORT int __cdecl snprintf( char *buffer, size_t count, const char *format, ... );
 
+#endif
+
 /* Conflict with STL_port inline implementation */
 
 #ifdef __cplusplus
diff --git a/sal/systools/win32/uwinapi/sntprintf.c b/sal/systools/win32/uwinapi/sntprintf.c
index 424e5bd..c519da3 100644
--- a/sal/systools/win32/uwinapi/sntprintf.c
+++ b/sal/systools/win32/uwinapi/sntprintf.c
@@ -40,6 +40,8 @@ static int __cdecl _vsctprintf( const _TXCHAR *format, va_list ap )
 }
 #endif
 
+#if !defined(__MINGW32__) || defined (__NO_ISOCEXT)
+
 /*  This function retrieves the pointer to the last character of a buffer.
     That is the pointer to the last character of the buffer that fits
     completly into that buffer or the position of the terminating zero.
@@ -122,4 +124,6 @@ _SNPRINTF_DLLIMPORT int __cdecl sntprintf( _TCHAR *buffer, size_t count, const _
     return retval;
 }
 
+#endif
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit f61d4545b5fdced396153fac405be75a697a640c
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Fri Feb 24 18:33:11 2012 +0100

    MinGW: Don't build PostgreSQL, not cross-compiling at the moment.

diff --git a/distro-configs/LibreOfficeMinGW.conf b/distro-configs/LibreOfficeMinGW.conf
index fcca57a..7d4bc8a 100644
--- a/distro-configs/LibreOfficeMinGW.conf
+++ b/distro-configs/LibreOfficeMinGW.conf
@@ -27,3 +27,4 @@
 --disable-extension-integration
 --disable-mozilla
 --disable-xmlsec
+--disable-postgresql-sdbc


More information about the Libreoffice-commits mailing list