--- ./pyuno/prj/d.lst.orig 2003-08-15 21:36:14.000000000 +0900 +++ ./pyuno/prj/d.lst 2004-01-13 23:13:28.000000000 +0900 @@ -1,8 +1,11 @@ ..\%__SRC%\lib\libpyuno.so %_DEST%\lib%_EXT%\libpyuno.so +..\%__SRC%\lib\libpyuno.a %_DEST%\lib%_EXT%\libpyuno.a ..\%__SRC%\lib\libpyuno.dylib %_DEST%\lib%_EXT%\libpyuno.dylib ..\%__SRC%\lib\pyuno.so %_DEST%\lib%_EXT%\pyuno.so +..\%__SRC%\lib\pyuno.a %_DEST%\lib%_EXT%\pyuno.a ..\%__SRC%\lib\pyuno.dylib %_DEST%\lib%_EXT%\pyuno.dylib ..\%__SRC%\lib\pythonloader.uno.so %_DEST%\lib%_EXT%\pythonloader.uno.so +..\%__SRC%\lib\pythonloader.uno.a %_DEST%\lib%_EXT%\pythonloader.uno.a ..\%__SRC%\lib\pythonloader.uno.dylib %_DEST%\lib%_EXT%\pythonloader.uno.dylib ..\%__SRC%\lib\unohelper.py %_DEST%\lib%_EXT%\unohelper.py ..\%__SRC%\lib\pythonloader.py %_DEST%\lib%_EXT%\pythonloader.py --- ./python/prj/d.lst.orig 2003-07-17 02:34:28.000000000 +0900 +++ ./python/prj/d.lst 2004-01-06 20:59:12.000000000 +0900 @@ -53,6 +53,12 @@ ..\%__SRC%\lib\libpython.so.2.2.2 %_DEST%\lib%_EXT%\libpython.so.2.2.2 ..\%__SRC%\lib\libpython*.dylib %_DEST%\lib%_EXT%\libpython*.dylib +#MingW ONLY ! +..\%__SRC%\misc\build\python-inst\include\python22\pyconfig.h %_DEST%\inc%_EXT%\python\pyconfig.h +..\%__SRC%\misc\build\python-inst\bin\python.exe %_DEST%\bin%_EXT%\python.exe +..\%__SRC%\bin\python22.dll %_DEST%\bin%_EXT%\python22.dll +..\%__SRC%\misc\build\Python-2.2.2\libpython22.dll.a %_DEST%\lib%_EXT%\libpython.a + # WINDOWS ONLY ! ..\%__SRC%\misc\build\pyconfig.h %_DEST%\inc%_EXT%\python\pyconfig.h ..\%__SRC%\misc\build\Python-2.2.2\PCBuild\python.exe %_DEST%\bin%_EXT%\python.exe --- ./python/Python-2.2.2.patch.orig 2003-08-15 20:22:36.000000000 +0900 +++ ./python/Python-2.2.2.patch 2004-01-05 00:15:22.000000000 +0900 @@ -1,158 +1,3 @@ -*** misc/Python-2.2.2/Makefile.pre.in Fri Aug 23 18:05:49 2002 ---- misc/build/Python-2.2.2/Makefile.pre.in Fri Aug 1 17:45:30 2003 -*************** -*** 350,355 **** ---- 350,359 ---- - libtool -o $(LDLIBRARY) -dynamic $(OTHER_LIBTOOL_OPT) $(LIBRARY) \ - -framework System @LIBTOOL_CRUFT@ - -+ libpython$(VERSION).dylib: $(LIBRARY) -+ libtool -o $(LDLIBRARY) -dynamic $(OTHER_LIBTOOL_OPT) $(LIBRARY) \ -+ -framework System @LIBTOOL_CRUFT@ -+ - # This rule builds the Cygwin Python DLL - libpython$(VERSION).dll.a: $(LIBRARY_OBJS) - dlltool --export-all --output-def $@ $^ -*************** -*** 560,565 **** ---- 564,573 ---- - $(INSTALL_DATA) libpython$(VERSION).so $(LIBDIR); \ - else true; \ - fi -+ if test -f libpython$(VERSION).dylib; then \ -+ $(INSTALL_DATA) libpython$(VERSION).dylib $(LIBDIR); \ -+ else true; \ -+ fi - if test -f "$(DLLLIBRARY)"; then \ - $(INSTALL_SHARED) $(DLLLIBRARY) $(BINDIR); \ - else true; \ -*************** -*** 689,695 **** - @if test -d $(LDLIBRARY); then :; else \ - if test "$(PYTHONFRAMEWORKDIR)" = no-framework; then \ - $(INSTALL_DATA) $(LDLIBRARY) $(LIBPL)/$(LDLIBRARY) ; \ -! $(RANLIB) $(LIBPL)/$(LDLIBRARY) ; \ - else \ - echo Skip install of $(LDLIBRARY) - use make frameworkinstall; \ - fi; \ ---- 697,705 ---- - @if test -d $(LDLIBRARY); then :; else \ - if test "$(PYTHONFRAMEWORKDIR)" = no-framework; then \ - $(INSTALL_DATA) $(LDLIBRARY) $(LIBPL)/$(LDLIBRARY) ; \ -! if test "$(LDLIBRARY)" != libpython$(VERSION).dylib; then \ -! $(RANLIB) $(LIBPL)/$(LDLIBRARY) ; \ -! fi \ - else \ - echo Skip install of $(LDLIBRARY) - use make frameworkinstall; \ - fi; \ -*** misc/Python-2.2.2/configure Thu Oct 10 17:26:41 2002 ---- misc/build/Python-2.2.2/configure Thu Aug 7 18:02:16 2003 -*************** -*** 1454,1459 **** ---- 1454,1462 ---- - LDLIBRARY='libpython$(VERSION).dll.a' - DLLLIBRARY='libpython$(VERSION).dll' - ;; -+ darwin*) -+ LDLIBRARY='libpython$(VERSION).dylib' -+ ;; - esac - - # MacOSX framework builds need more magic. LDLIBRARY is the dynamic -*************** -*** 1696,1702 **** - esac - case $ac_sys_system in - Darwin*) -! OPT="$OPT -no-cpp-precomp";; - esac - fi - ---- 1699,1719 ---- - esac - case $ac_sys_system in - Darwin*) -! OPT="$OPT -dynamic -no-cpp-precomp -fno-common -fPIC -malign-natural";; -! FreeBSD*) -! OPT="$OPT $PTHREAD_CFLAGS";; -! Solaris*) -! OPT="$OPT -KPIC";; -! Linux*) -! case "`uname -m`" in -! ppc*) -! OPT="$OPT -fPIC";; -! sparc64*) -! OPT="$OPT -fPIC";; -! *) -! OPT="$OPT";; -! esac -! ;; - esac - fi - -*************** -*** 3100,3108 **** - LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';; - Darwin/*) - ns_undef_sym='_environ' -! LIBTOOL_CRUFT="-lcc_dynamic -arch_only ppc -flat_namespace -U $ns_undef_sym" - LIBTOOL_CRUFT="$LIBTOOL_CRUFT $extra_frameworks" -! LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/Python' - LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';; - esac - ---- 3117,3125 ---- - LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';; - Darwin/*) - ns_undef_sym='_environ' -! LIBTOOL_CRUFT="-lcc_dynamic -arch_only ppc" - LIBTOOL_CRUFT="$LIBTOOL_CRUFT $extra_frameworks" -! LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name @executable_path/$(LDLIBRARY)' - LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';; - esac - -*************** -*** 3159,3164 **** ---- 3176,3182 ---- - case $ac_sys_system in - hp*|HP*) SO=.sl;; - CYGWIN*) SO=.dll;; -+ Darwin*) SO=.dylib;; - *) SO=.so;; - esac - fi -*************** -*** 3201,3214 **** - LDSHARED="$LDSHARED -undefined suppress" - fi ;; - Darwin/*) -! LDSHARED='$(CC) $(LDFLAGS) -bundle' - if test "$enable_framework" ; then - # Link against the framework. All externals should be defined. - LDSHARED="$LDSHARED "'-framework $(PYTHONFRAMEWORK)' - else - # No framework, use the Python app as bundle-loader -! BLDSHARED="$LDSHARED "'-bundle_loader $(BUILDPYTHON)' -! LDSHARED="$LDSHARED "'-bundle_loader $(BINDIR)/$(PYTHON)' - fi ;; - Linux*) LDSHARED='$(CC) -shared';; - dgux*) LDSHARED="ld -G";; ---- 3219,3233 ---- - LDSHARED="$LDSHARED -undefined suppress" - fi ;; - Darwin/*) -! LDSHARED='g++ -dynamiclib $(LDFLAGS) -framework System -framework CoreServices -framework Foundation -lstdc++ -lcc_dynamic -L. -lpython$(VERSION)' - if test "$enable_framework" ; then - # Link against the framework. All externals should be defined. - LDSHARED="$LDSHARED "'-framework $(PYTHONFRAMEWORK)' - else - # No framework, use the Python app as bundle-loader -! #BLDSHARED="$LDSHARED "'-bundle_loader $(BUILDPYTHON)' -! #LDSHARED="$LDSHARED "'-bundle_loader $(BINDIR)/$(PYTHON)' -! LDSHARED="$LDSHARED" - fi ;; - Linux*) LDSHARED='$(CC) -shared';; - dgux*) LDSHARED="ld -G";; *** misc/Python-2.2.2/setup.py Thu Oct 10 02:59:16 2002 --- misc/build/Python-2.2.2/setup.py Fri Aug 1 17:45:32 2003 *************** @@ -206,37 +51,6 @@ #else #ifndef HAVE_GETTIMEOFDAY #error "This module requires gettimeofday() on non-Windows platforms!" -*** misc/Python-2.2.2/Modules/posixmodule.c Fri Aug 23 18:27:40 2002 ---- misc/build/Python-2.2.2/Modules/posixmodule.c Fri Aug 1 17:45:31 2003 -*************** -*** 271,276 **** ---- 271,279 ---- - # define STRUCT_STAT struct stat - #endif - -+ #ifdef __APPLE__ -+ #include -+ #endif - - /* Return a dictionary corresponding to the POSIX environment table */ - -*************** -*** 281,288 **** ---- 284,297 ---- - static PyObject * - convertenviron(void) - { -+ #ifdef __APPLE__ -+ char **environ; -+ #endif - PyObject *d; - char **e; -+ #ifdef __APPLE__ -+ environ = *_NSGetEnviron(); -+ #endif - d = PyDict_New(); - if (d == NULL) - return NULL; *** misc/Python-2.2.2/Modules/timemodule.c Tue Mar 12 22:38:31 2002 --- misc/build/Python-2.2.2/Modules/timemodule.c Fri Aug 1 17:45:31 2003 *************** @@ -1839,3 +1653,516 @@ } #endif /* USE_DYLD */ +--- misc/build/Python-2.2.2/Makefile.pre.in.orig 2002-08-24 01:05:50.000000000 +0900 ++++ misc/build/Python-2.2.2/Makefile.pre.in 2003-10-13 20:57:08.000000000 +0900 +@@ -350,6 +350,10 @@ + libtool -o $(LDLIBRARY) -dynamic $(OTHER_LIBTOOL_OPT) $(LIBRARY) \ + -framework System @LIBTOOL_CRUFT@ + ++libpython$(VERSION).dylib: $(LIBRARY) ++ libtool -o $(LDLIBRARY) -dynamic $(OTHER_LIBTOOL_OPT) $(LIBRARY) \ ++ -framework System @LIBTOOL_CRUFT@ ++ + # This rule builds the Cygwin Python DLL + libpython$(VERSION).dll.a: $(LIBRARY_OBJS) + dlltool --export-all --output-def $@ $^ +@@ -560,6 +564,10 @@ + $(INSTALL_DATA) libpython$(VERSION).so $(LIBDIR); \ + else true; \ + fi ++ if test -f libpython$(VERSION).dylib; then \ ++ $(INSTALL_DATA) libpython$(VERSION).dylib $(LIBDIR); \ ++ else true; \ ++ fi + if test -f "$(DLLLIBRARY)"; then \ + $(INSTALL_SHARED) $(DLLLIBRARY) $(BINDIR); \ + else true; \ +@@ -651,8 +659,8 @@ + mkdir $(srcdir)/Lib/$(PLATDIR) + cp $(srcdir)/Lib/plat-generic/regen $(srcdir)/Lib/$(PLATDIR)/regen + export PATH; PATH="`pwd`:$$PATH"; \ +- export PYTHONPATH; PYTHONPATH="`pwd`/Lib"; \ +- export DYLD_FRAMEWORK_PATH; DYLD_FRAMEWORK_PATH="`pwd`"; \ ++ export PYTHONPATH; PYTHONPATH="`$(PWDCMD)`/Lib"; \ ++ export DYLD_FRAMEWORK_PATH; DYLD_FRAMEWORK_PATH="`$(PWDCMD)`"; \ + export EXE; EXE="$(BUILDEXE)"; \ + cd $(srcdir)/Lib/$(PLATDIR); ./regen + +@@ -689,7 +697,9 @@ + @if test -d $(LDLIBRARY); then :; else \ + if test "$(PYTHONFRAMEWORKDIR)" = no-framework; then \ + $(INSTALL_DATA) $(LDLIBRARY) $(LIBPL)/$(LDLIBRARY) ; \ +- $(RANLIB) $(LIBPL)/$(LDLIBRARY) ; \ ++ if test "$(LDLIBRARY)" != libpython$(VERSION).dylib; then \ ++ $(RANLIB) $(LIBPL)/$(LDLIBRARY) ; \ ++ fi \ + else \ + echo Skip install of $(LDLIBRARY) - use make frameworkinstall; \ + fi; \ +--- misc/build/Python-2.2.2/Python/thread_pthread.h.orig 2002-10-04 19:16:28.000000000 +0900 ++++ misc/build/Python-2.2.2/Python/thread_pthread.h 2003-10-15 22:32:48.000000000 +0900 +@@ -176,8 +176,10 @@ + * thread. This causes the new thread to start with all signals + * blocked. + */ ++#ifndef __MINGW32__ + sigfillset(&newmask); + SET_THREAD_SIGMASK(SIG_BLOCK, &newmask, &oldmask); ++#endif + + success = pthread_create(&th, + #if defined(PY_PTHREAD_D4) +@@ -204,7 +206,9 @@ + ); + + /* Restore signal mask for original thread */ ++#ifndef __MINGW32__ + SET_THREAD_SIGMASK(SIG_SETMASK, &oldmask, NULL); ++#endif + + #if defined(THREAD_STACK_SIZE) || defined(PTHREAD_SYSTEM_SCHED_SUPPORTED) + pthread_attr_destroy(&attrs); +--- misc/build/Python-2.2.2/Modules/posixmodule.c.orig 2002-08-24 01:27:40.000000000 +0900 ++++ misc/build/Python-2.2.2/Modules/posixmodule.c 2003-10-15 23:28:58.000000000 +0900 +@@ -48,6 +48,14 @@ + + /* Various compilers have only certain posix functions */ + /* XXX Gosh I wish these were all moved into pyconfig.h */ ++#ifdef __MINGW32__ ++#define HAVE_EXECV 1 ++#define HAVE_GETCWD 1 ++#define HAVE_OPENDIR 1 ++#define HAVE_PIPE 1 ++#define HAVE_POPEN 1 ++#define HAVE_SYSTEM 1 ++#else + #if defined(PYCC_VACPP) && defined(PYOS_OS2) + #include + #else +@@ -104,6 +112,7 @@ + #endif /* __BORLANDC__ */ + #endif /* ! __WATCOMC__ || __QNX__ */ + #endif /* ! __IBMC__ */ ++#endif /* ! __MINGW32__ */ + + #ifndef _MSC_VER + +@@ -271,6 +280,9 @@ + # define STRUCT_STAT struct stat + #endif + ++#ifdef __APPLE__ ++#include ++#endif + + /* Return a dictionary corresponding to the POSIX environment table */ + +@@ -281,8 +293,14 @@ + static PyObject * + convertenviron(void) + { ++#ifdef __APPLE__ ++ char **environ; ++#endif + PyObject *d; + char **e; ++#ifdef __APPLE__ ++ environ = *_NSGetEnviron(); ++#endif + d = PyDict_New(); + if (d == NULL) + return NULL; +@@ -674,7 +692,7 @@ + char *pathfree = NULL; /* this memory must be free'd */ + int res; + +-#ifdef MS_WIN32 ++#if defined(MS_WIN32) || defined (__MINGW32__) + int pathlen; + char pathcopy[MAX_PATH]; + #endif /* MS_WIN32 */ +@@ -684,7 +702,7 @@ + return NULL; + pathfree = path; + +-#ifdef MS_WIN32 ++#if defined(MS_WIN32) || defined (__MINGW32__) + pathlen = strlen(path); + /* the library call can blow up if the file name is too long! */ + if (pathlen > MAX_PATH) { +@@ -1224,7 +1242,7 @@ + Py_FileSystemDefaultEncoding, &path, &mode)) + return NULL; + Py_BEGIN_ALLOW_THREADS +-#if ( defined(__WATCOMC__) || defined(_MSC_VER) || defined(PYCC_VACPP) ) && !defined(__QNX__) ++#if ( defined(__WATCOMC__) || defined(_MSC_VER) || defined(__MINGW32__) || defined(PYCC_VACPP) ) && !defined(__QNX__) + res = mkdir(path); + #else + res = mkdir(path, mode); +@@ -3864,7 +3882,11 @@ + if (!PyArg_ParseTuple(args, ":pipe")) + return NULL; + Py_BEGIN_ALLOW_THREADS ++#ifdef __MINGW32__ ++ res = _pipe(fds, 1024, O_BINARY); ++#else + res = pipe(fds); ++#endif + Py_END_ALLOW_THREADS + if (res != 0) + return posix_error(); +--- misc/build/Python-2.2.2/Include/osdefs.h.orig 2001-03-02 15:10:18.000000000 +0900 ++++ misc/build/Python-2.2.2/Include/osdefs.h 2003-10-26 11:04:14.000000000 +0900 +@@ -16,7 +16,7 @@ + + /* Mod by chrish: QNX has WATCOM, but isn't DOS */ + #if !defined(__QNX__) +-#if defined(MS_WINDOWS) || defined(__BORLANDC__) || defined(__WATCOMC__) || defined(__DJGPP__) || defined(PYOS_OS2) ++#if defined(MS_WINDOWS) || defined(__BORLANDC__) || defined(__WATCOMC__) || defined(__DJGPP__) || defined(PYOS_OS2) || defined(__MINGW32__) + #define SEP '\\' + #define ALTSEP '/' + #define MAXPATHLEN 256 +--- misc/build/Python-2.2.2/Modules/getpath.c.orig 2002-09-13 23:40:50.000000000 +0900 ++++ misc/build/Python-2.2.2/Modules/getpath.c 2003-10-26 23:59:50.000000000 +0900 +@@ -10,6 +10,10 @@ + #include + #endif + ++#ifdef __MINGW32__ ++#include ++#endif ++ + /* Search in some common locations for the associated Python libraries. + * + * Two directories must be found, the platform independent directory +@@ -195,13 +199,17 @@ + joinpath(char *buffer, char *stuff) + { + size_t n, k; ++#ifndef __MINGW32__ + if (stuff[0] == SEP) + n = 0; + else { ++#endif + n = strlen(buffer); + if (n > 0 && buffer[n-1] != SEP && n < MAXPATHLEN) + buffer[n++] = SEP; ++#ifndef __MINGW32__ + } ++#endif + k = strlen(stuff); + if (n + k > MAXPATHLEN) + k = MAXPATHLEN - n; +@@ -214,13 +222,21 @@ + static void + copy_absolute(char *path, char *p) + { ++#ifdef __MINGW32__ ++ if (strlen(path) > 2 && path[1] == ':' && path[2] == SEP) ++#else + if (p[0] == SEP) ++#endif + strcpy(path, p); + else { ++#ifdef __MINGW32__ ++ GetFullPathName(path, MAXPATHLEN, path, NULL); ++#else + getcwd(path, MAXPATHLEN); + if (p[0] == '.' && p[1] == SEP) + p += 2; + joinpath(path, p); ++#endif + } + } + +@@ -230,8 +246,13 @@ + { + char buffer[MAXPATHLEN + 1]; + ++#ifdef __MINGW32__ ++ if (strlen(path) > 2 && path[1] == ':' && path[2] == SEP) ++ return; ++#else + if (path[0] == SEP) + return; ++#endif + copy_absolute(buffer, path); + strcpy(path, buffer); + } +@@ -502,7 +523,11 @@ + prefixsz = strlen(prefix) + 1; + + while (1) { ++#ifdef __MINGW32__ ++ char *delim = strchr(defpath, ':'); ++#else + char *delim = strchr(defpath, DELIM); ++#endif + + if (defpath[0] != SEP) + /* Paths are relative to prefix */ +@@ -542,7 +567,11 @@ + */ + defpath = pythonpath; + while (1) { ++#ifdef __MINGW32__ ++ char *delim = strchr(defpath, ':'); ++#else + char *delim = strchr(defpath, DELIM); ++#endif + + if (defpath[0] != SEP) { + strcat(buf, prefix); +@@ -552,7 +581,12 @@ + if (delim) { + size_t len = delim - defpath + 1; + size_t end = strlen(buf) + len; ++#ifdef __MINGW32__ ++ strncat(buf, defpath, len-1); ++ *(buf + end-1) = DELIM; ++#else + strncat(buf, defpath, len); ++#endif + *(buf + end) = '\0'; + } + else { +--- misc/build/Python-2.2.2/Modules/config.c.in.orig 2001-08-30 09:12:32.000000000 +0900 ++++ misc/build/Python-2.2.2/Modules/config.c.in 2003-10-26 20:06:10.000000000 +0900 +@@ -39,6 +39,9 @@ + {"__builtin__", NULL}, + {"sys", NULL}, + {"exceptions", NULL}, ++#ifdef __MINGW32__ ++ {"mingw32", NULL}, ++#endif + + #ifdef WITH_CYCLE_GC + /* This lives in gcmodule.c */ +--- misc/build/Python-2.2.2/Lib/os.py.orig 2002-09-07 13:49:10.000000000 +0900 ++++ misc/build/Python-2.2.2/Lib/os.py 2003-10-26 22:07:10.000000000 +0900 +@@ -37,7 +37,25 @@ + except AttributeError: + return [n for n in dir(module) if n[0] != '_'] + +-if 'posix' in _names: ++if 'mingw32' in _names: ++ name = 'posix' ++ linesep = '\r\n' ++ curdir = '.'; pardir = '..'; sep = '\\'; pathsep = ';' ++ defpath = '.' ++ from posix import * ++ try: ++ from posix import _exit ++ except ImportError: ++ pass ++ import ntpath ++ path = ntpath ++ del ntpath ++ ++ import posix ++ __all__.extend(_get_exports_list(posix)) ++ del posix ++ ++elif 'posix' in _names: + name = 'posix' + linesep = '\n' + curdir = '.'; pardir = '..'; sep = '/'; pathsep = ':' +--- misc/build/Python-2.2.2/Lib/site.py.orig 2002-10-06 12:52:44.000000000 +0900 ++++ misc/build/Python-2.2.2/Lib/site.py 2003-10-26 23:29:36.000000000 +0900 +@@ -165,7 +165,7 @@ + prefixes.append(sys.exec_prefix) + for prefix in prefixes: + if prefix: +- if os.sep == '/': ++ if os.name == "posix": + sitedirs = [os.path.join(prefix, + "lib", + "python" + sys.version[:3], +--- misc/build/Python-2.2.2/Lib/distutils/spawn.py.orig 2001-12-07 05:51:36.000000000 +0900 ++++ misc/build/Python-2.2.2/Lib/distutils/spawn.py 2003-10-27 06:03:52.000000000 +0900 +@@ -34,9 +34,10 @@ + Raise DistutilsExecError if running the program fails in any way; just + return on success. + """ +- if os.name == 'posix': ++ from os import _exists ++ if _exists("fork"): + _spawn_posix(cmd, search_path, verbose, dry_run) +- elif os.name == 'nt': ++ elif _exists("spawnv"): + _spawn_nt(cmd, search_path, verbose, dry_run) + else: + raise DistutilsPlatformError, \ +--- misc/build/Python-2.2.2/Python/fileblocks.c.orig 2003-11-02 16:29:14.000000000 +0900 ++++ misc/build/Python-2.2.2/Python/fileblocks.c 2003-11-02 16:46:58.000000000 +0900 +@@ -1 +0,0 @@ +-dummy +--- misc/build/Python-2.2.2/configure.orig 2002-10-11 00:26:42.000000000 +0900 ++++ misc/build/Python-2.2.2/configure 2004-01-05 00:08:42.000000000 +0900 +@@ -665,6 +665,12 @@ + fi + echo "$ac_t""$MACHDEP" 1>&6 + ++case $MACHDEP in ++cygwin*) ++ VERSION=`echo $VERSION|tr -d .` ++ ;; ++esac ++ + # checks for alternative programs + echo $ac_n "checking for --without-gcc""... $ac_c" 1>&6 + echo "configure:671: checking for --without-gcc" >&5 +@@ -1380,7 +1386,7 @@ + echo "configure:1381: checking LIBRARY" >&5 + if test -z "$LIBRARY" + then +- LIBRARY='libpython$(VERSION).a' ++LIBRARY='libpython$(VERSION).a' + fi + echo "$ac_t""$LIBRARY" 1>&6 + +@@ -1452,8 +1458,11 @@ + ;; + cygwin*) + LDLIBRARY='libpython$(VERSION).dll.a' +- DLLLIBRARY='libpython$(VERSION).dll' ++ DLLLIBRARY='python$(VERSION).dll' + ;; ++darwin*) ++ LDLIBRARY='libpython$(VERSION).dylib' ++ ;; + esac + + # MacOSX framework builds need more magic. LDLIBRARY is the dynamic +@@ -1696,7 +1705,21 @@ + esac + case $ac_sys_system in + Darwin*) +- OPT="$OPT -no-cpp-precomp";; ++ OPT="$OPT -dynamic -no-cpp-precomp -fno-common -fPIC -malign-natural";; ++ FreeBSD*) ++ OPT="$OPT $PTHREAD_CFLAGS";; ++ Solaris*) ++ OPT="$OPT -KPIC";; ++ Linux*) ++ case "`uname -m`" in ++ ppc*) ++ OPT="$OPT -fPIC";; ++ sparc64*) ++ OPT="$OPT -fPIC";; ++ *) ++ OPT="$OPT";; ++ esac ++ ;; + esac + fi + +@@ -3100,9 +3123,9 @@ + LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';; + Darwin/*) + ns_undef_sym='_environ' +- LIBTOOL_CRUFT="-lcc_dynamic -arch_only ppc -flat_namespace -U $ns_undef_sym" ++ LIBTOOL_CRUFT="-lcc_dynamic -arch_only ppc" + LIBTOOL_CRUFT="$LIBTOOL_CRUFT $extra_frameworks" +- LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/Python' ++ LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name @executable_path/$(LDLIBRARY)' + LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';; + esac + +@@ -3159,6 +3182,7 @@ + case $ac_sys_system in + hp*|HP*) SO=.sl;; + CYGWIN*) SO=.dll;; ++ Darwin*) SO=.dylib;; + *) SO=.so;; + esac + fi +@@ -3201,14 +3225,15 @@ + LDSHARED="$LDSHARED -undefined suppress" + fi ;; + Darwin/*) +- LDSHARED='$(CC) $(LDFLAGS) -bundle' ++ LDSHARED='g++ -dynamiclib $(LDFLAGS) -framework System -framework CoreServices -framework Foundation -lstdc++ -lcc_dynamic -L. -lpython$(VERSION)' + if test "$enable_framework" ; then + # Link against the framework. All externals should be defined. + LDSHARED="$LDSHARED "'-framework $(PYTHONFRAMEWORK)' + else + # No framework, use the Python app as bundle-loader +- BLDSHARED="$LDSHARED "'-bundle_loader $(BUILDPYTHON)' +- LDSHARED="$LDSHARED "'-bundle_loader $(BINDIR)/$(PYTHON)' ++ #BLDSHARED="$LDSHARED "'-bundle_loader $(BUILDPYTHON)' ++ #LDSHARED="$LDSHARED "'-bundle_loader $(BINDIR)/$(PYTHON)' ++ LDSHARED="$LDSHARED" + fi ;; + Linux*) LDSHARED='$(CC) -shared';; + dgux*) LDSHARED="ld -G";; +@@ -4012,6 +4037,51 @@ + else + echo "$ac_t""no" 1>&6 + ++ echo $ac_n "checking for pthread_create in -lpthreadGCE""... $ac_c" 1>&6 ++echo "configure:3972: checking for pthread_create in -lpthreadGCE" >&5 ++ac_lib_var=`echo pthreadGCE'_'pthread_create | sed 'y%./+-%__p_%'` ++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else ++ ac_save_LIBS="$LIBS" ++LIBS="-lpthreadGCE $LIBS" ++cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=no" ++fi ++rm -f conftest* ++LIBS="$ac_save_LIBS" ++ ++fi ++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then ++ echo "$ac_t""yes" 1>&6 ++ cat >> confdefs.h <<\EOF ++#define WITH_THREAD 1 ++EOF ++ ++ posix_threads=yes ++ LIBS="$LIBS -lpthreadGCE" ++ LIBOBJS="$LIBOBJS thread.o" ++else ++ echo "$ac_t""no" 1>&6 ++ + echo $ac_n "checking for __d6_pthread_create in -lthread""... $ac_c" 1>&6 + echo "configure:4017: checking for __d6_pthread_create in -lthread" >&5 + ac_lib_var=`echo thread'_'__d6_pthread_create | sed 'y%./+-%__p_%'` +@@ -4164,6 +4234,8 @@ + fi + + fi ++ ++fi + rm -f conftest* + fi + +@@ -7661,7 +7733,7 @@ + + trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15 + +-DEFS=-DHAVE_CONFIG_H ++ + + # Without the "./", some shells look in PATH for config.status. + : ${CONFIG_STATUS=./config.status} --- ./crashrep/source/win32/soreport.cpp.orig 2003-07-25 20:27:48.000000000 +0900 +++ ./crashrep/source/win32/soreport.cpp 2004-01-12 01:53:24.000000000 +0900 @@ -53,6 +53,10 @@ #define MAX_TEXT_BUFFER (32*1024-1) #define MAX_HOSTNAME (1024) +#ifdef __MINGW32__ +#define PIMAGE_NT_HEADERS32 PIMAGE_NT_HEADERS +#define PPROCESS_INFORMATION LPPROCESS_INFORMATION +#endif #include using namespace ::std; @@ -1537,7 +1541,41 @@ static bool ParseCommandArgs( LPDWORD pdwProcessId, PEXCEPTION_POINTERS* ppException, LPDWORD pdwThreadId ) { int argc = __argc; +#ifdef __MINGW32__ +#ifdef _UNICODE + TCHAR **argv = alloca((argc+1)*sizeof(WCHAR*)); + int *sizes = alloca(argc*sizeof(int)); + int argsize=0; + char **ptr; + int i; + ptr=__argv; + for (i = 0; i < argc; ++i) + { + sizes[i]=MultiByteToWideChar(CP_ACP, 0, *ptr, -1, NULL, 0); + argsize+=sizes[i]+1; + ++ptr; + } + ++argsize; + TCHAR *args = alloca(argsize*sizeof(WCHAR)); + ptr=__argv; + TCHAR *cptr=args; + for (i = 0; i < argc; ++i) + { + argv[i]=cptr; + MultiByteToWideChar( CP_ACP, 0, *ptr, -1, cptr, sizes[i] ); + ++ptr; + cptr+=sizes[i]; + *cptr=0; + ++cptr; + } + argv[i]=cptr; + *cptr=0; +#else + TCHAR **argv = __argv; +#endif +#else TCHAR **argv = __targv; +#endif bool bSuccess = true; for ( int argn = 1; bSuccess && argn < argc; argn++ ) @@ -2237,7 +2275,11 @@ //*************************************************************************** +#ifdef __MINGW32__ +int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE, LPSTR lpCmdLine, int ) +#else int WINAPI _tWinMain( HINSTANCE hInstance, HINSTANCE, LPTSTR lpCmdLine, int ) +#endif { int exitcode = -1; --- ./crashrep/source/win32/rcheader.txt.orig 2003-06-06 20:22:06.000000000 +0900 +++ ./crashrep/source/win32/rcheader.txt 2004-01-12 01:13:56.000000000 +0900 @@ -1,4 +1,8 @@ // Header #include "resource.h" #include "winres.h" +#ifdef __MINGW32__ +#define TCS_MULTISELECT 4 +#define TCS_VERTICAL 0x80 +#endif --- ./regexp/prj/d.lst.orig 2003-04-24 21:34:08.000000000 +0900 +++ ./regexp/prj/d.lst 2004-01-13 07:25:46.000000000 +0900 @@ -4,6 +4,7 @@ ..\%__SRC%\bin\i18nregexp*.dll %_DEST%\bin%_EXT%\i18nregexp*.dll ..\%__SRC%\lib\libi18nregexp*.so %_DEST%\lib%_EXT%\libi18nregexp*.so +..\%__SRC%\lib\libi18nregexp*.a %_DEST%\lib%_EXT%\libi18nregexp*.a ..\%__SRC%\lib\libi18nregexp*.dylib %_DEST%\lib%_EXT%\libi18nregexp*.dylib ..\%__SRC%\lib\ii18nregexp.lib %_DEST%\lib%_EXT%\ii18nregexp.lib --- ./i18nutil/prj/d.lst.orig 2003-04-24 21:26:02.000000000 +0900 +++ ./i18nutil/prj/d.lst 2003-12-27 11:30:44.000000000 +0900 @@ -10,6 +10,7 @@ ..\%__SRC%\bin\i18nutil*.dll %_DEST%\bin%_EXT%\i18nutil*.dll ..\%__SRC%\lib\libi18nutil*.so %_DEST%\lib%_EXT%\libi18nutil*.so ..\%__SRC%\lib\libi18nutil*.dylib %_DEST%\lib%_EXT%\libi18nutil*.dylib +..\%__SRC%\lib\libi18nutil*.a %_DEST%\lib%_EXT%\libi18nutil*.a ..\%__SRC%\lib\ii18nutil.lib %_DEST%\lib%_EXT%\ii18nutil.lib ..\%__SRC%\lib\lib*static*.dylib %_DEST%\lib%_EXT%\lib*static*.dylib --- ./embedserv/source/inc/common.h.orig 2003-03-25 17:24:24.000000000 +0900 +++ ./embedserv/source/inc/common.h 2003-12-23 19:43:32.000000000 +0900 @@ -62,8 +62,14 @@ #ifndef _COMMON_H_ #define _COMMON_H_ +#ifdef __MINGW32__ +#include +#include +#include +#else #include "stdafx.h" #include +#endif #ifndef _RTL_USTRING_HXX_ #include @@ -91,6 +97,71 @@ const sal_Int32 nConstBufferSize = 32000; +#ifdef __MINGW32__ +template +class XWindowsComPtr +{ +public: + XWindowsComPtr() + { + p=NULL; + } + ~XWindowsComPtr() + { + if (p) + p->Release(); + } + XWindowsComPtr(const XWindowsComPtr& lp) + { + if ((p = lp.p) != NULL) + p->AddRef(); + } + T* operator=(const XWindowsComPtr& lp) + { + return assign(lp.p); + } + T* operator=(T* lp) + { + return assign(lp); + } + bool operator!() const + { + return (p == NULL); + } + operator T*() const + { + return p; + } + T* operator->() const + { + return p; + } + T** operator&() + { + return &p; + } +private: + T* assign(T* lp) + { + if (lp != NULL) + lp->AddRef(); + if (p) + p->Release(); + return p = lp; + } + XWindowsComPtr(T* lp) + { + if ((p = lp) != NULL) + p->AddRef(); + } + bool operator==(T* pT) const + { + return p == pT; + } + T* p; +}; +#endif + #define SUPPORTED_FACTORIES_NUM 5 // {30A2652A-DDF7-45e7-ACA6-3EAB26FC8A4E} @@ -114,6 +185,5 @@ // {D0484DE6-AAEE-468a-991F-8D4B0737B57A} DEFINE_GUID(OID_MathServer, 0xd0484de6, 0xaaee, 0x468a, 0x99, 0x1f, 0x8d, 0x4b, 0x7, 0x37, 0xb5, 0x7a ); - #endif --- ./embedserv/source/inc/docholder.hxx.orig 2003-04-24 22:54:52.000000000 +0900 +++ ./embedserv/source/inc/docholder.hxx 2003-12-23 17:34:16.000000000 +0900 @@ -103,7 +103,11 @@ ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > DocumentFrame(); +#ifdef __MINGW32__ + XWindowsComPtr< IDispatch > m_pIDispatch; +#else CComPtr< IDispatch > m_pIDispatch; +#endif public: @@ -139,19 +143,22 @@ ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > GetDocument() { return m_xDocument; } // XEventListener - virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& aSource ); + virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& aSource ) + throw( ::com::sun::star::uno::RuntimeException ); // XCloseListener virtual void SAL_CALL queryClosing( const com::sun::star::lang::EventObject& aSource, sal_Bool bGetsOwnership ) throw( ::com::sun::star::util::CloseVetoException ); - virtual void SAL_CALL notifyClosing( const com::sun::star::lang::EventObject& aSource ); + virtual void SAL_CALL notifyClosing( const com::sun::star::lang::EventObject& aSource ) + throw( ::com::sun::star::uno::RuntimeException ); // XTerminateListener virtual void SAL_CALL queryTermination( const com::sun::star::lang::EventObject& aSource ) throw( ::com::sun::star::frame::TerminationVetoException ); - virtual void SAL_CALL notifyTermination( const com::sun::star::lang::EventObject& aSource ); + virtual void SAL_CALL notifyTermination( const com::sun::star::lang::EventObject& aSource ) + throw( ::com::sun::star::uno::RuntimeException ); // XModifyListener virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException); --- ./embedserv/source/inc/intercept.hxx.orig 2003-04-04 20:41:06.000000000 +0900 +++ ./embedserv/source/inc/intercept.hxx 2003-12-23 16:55:44.000000000 +0900 @@ -217,7 +217,7 @@ ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > m_xMasterDispatchProvider; - static ::com::sun::star::uno::Sequence<::rtl::OUString> + static ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aInterceptedURL; cppu::OInterfaceContainerHelper* m_pDisposeEventListeners; --- ./embedserv/source/inc/embeddoc.hxx.orig 2003-04-24 22:55:02.000000000 +0900 +++ ./embedserv/source/inc/embeddoc.hxx 2003-12-23 17:10:30.000000000 +0900 @@ -182,15 +182,26 @@ DocumentHolder* m_pDocHolder; ::rtl::OUString m_aFileName; +#ifdef __MINGW32__ + XWindowsComPtr< IStorage > m_pMasterStorage; + XWindowsComPtr< IStream > m_pOwnStream; + XWindowsComPtr< IStream > m_pExtStream; +#else CComPtr< IStorage > m_pMasterStorage; CComPtr< IStream > m_pOwnStream; CComPtr< IStream > m_pExtStream; +#endif GUID m_guid; sal_Bool m_bIsDirty; +#ifdef __MINGW32__ + XWindowsComPtr< IOleClientSite > m_pClientSite; + XWindowsComPtr< IDataAdviseHolder > m_pDAdviseHolder; +#else CComPtr< IOleClientSite > m_pClientSite; CComPtr< IDataAdviseHolder > m_pDAdviseHolder; +#endif AdviseSinkHashMap m_aAdviseHashMap; DWORD m_nAdviseNum; --- ./embedserv/source/inc/servprov.hxx.orig 2003-04-10 23:55:58.000000000 +0900 +++ ./embedserv/source/inc/servprov.hxx 2003-12-23 18:40:34.000000000 +0900 @@ -92,14 +92,14 @@ class EmbedServer_Impl : public ::cppu::OWeakObject, ::com::sun::star::lang::XTypeProvider { public: - EmbedServer_Impl( const ::com::sun::star::uno::Reference<::com::sun::star::lang::XMultiServiceFactory> &xFactory ); + EmbedServer_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > &xFactory ); ~EmbedServer_Impl(); // XInterface virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL acquire() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL release() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL acquire() throw (); + virtual void SAL_CALL release() throw (); // XTypeProvider virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) @@ -109,15 +109,19 @@ protected: +#ifdef __MINGW32__ + XWindowsComPtr< EmbedProviderFactory_Impl > m_pOLEFactories[ SUPPORTED_FACTORIES_NUM ]; +#else CComPtr< EmbedProviderFactory_Impl > m_pOLEFactories[ SUPPORTED_FACTORIES_NUM ]; - ::com::sun::star::uno::Reference<::com::sun::star::lang::XMultiServiceFactory> m_xFactory; +#endif + ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xFactory; }; class EmbedProviderFactory_Impl : public IClassFactory { public: - EmbedProviderFactory_Impl( const ::com::sun::star::uno::Reference<::com::sun::star::lang::XMultiServiceFactory>& xFactory, const GUID* pGuid); + EmbedProviderFactory_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xFactory, const GUID* pGuid); ~EmbedProviderFactory_Impl(); sal_Bool registerClass(); @@ -138,7 +142,7 @@ GUID m_guid; DWORD m_factoryHandle; - ::com::sun::star::uno::Reference<::com::sun::star::lang::XMultiServiceFactory> m_xFactory; + ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xFactory; }; #endif --- ./embedserv/source/embed/ed_idataobj.cxx.orig 2003-03-25 17:21:02.000000000 +0900 +++ ./embedserv/source/embed/ed_idataobj.cxx 2003-12-23 18:28:26.000000000 +0900 @@ -191,7 +191,11 @@ if ( !( pFormatetc->tymed & TYMED_ISTORAGE ) ) return DV_E_TYMED; +#ifdef __MINGW32__ + XWindowsComPtr< IStorage > pNewStg; +#else CComPtr< IStorage > pNewStg; +#endif HRESULT hr = StgCreateDocfile( NULL, STGM_CREATE | STGM_READWRITE | STGM_DELETEONRELEASE, 0, &pNewStg ); if ( FAILED( hr ) || !pNewStg ) return STG_E_MEDIUMFULL; --- ./embedserv/source/embed/ed_ipersiststr.cxx.orig 2003-04-24 22:54:32.000000000 +0900 +++ ./embedserv/source/embed/ed_ipersiststr.cxx 2003-12-27 01:45:46.000000000 +0900 @@ -282,8 +282,12 @@ { util::URL aURL; +#ifdef __MINGW32__ + aURL.Complete = ::rtl::OUString( reinterpret_cast( pFilePath ) ); +#else USES_CONVERSION; aURL.Complete = ::rtl::OUString( OLE2CW( pFilePath ) ); +#endif if ( aTransformer->parseSmart( aURL, ::rtl::OUString() ) ) sDocUrl = aURL.Complete; @@ -319,8 +323,13 @@ // for saveto operation the master storage // should not enter NoScribble mode +#ifdef __MINGW32__ + XWindowsComPtr< IStream > pOrigOwn = m_pOwnStream; + XWindowsComPtr< IStream > pOrigExt = m_pExtStream; +#else CComPtr< IStream > pOrigOwn = m_pOwnStream; CComPtr< IStream > pOrigExt = m_pExtStream; +#endif HRESULT hr = Save( pStg, sal_False ); m_pOwnStream = pOrigOwn; m_pExtStream = pOrigExt; @@ -457,11 +466,19 @@ CLIPFORMAT cf = RegisterClipboardFormatA( "Embedded Object" ); hr = WriteFmtUserTypeStg( pStg, cf, // ??? +#ifdef __MINGW32__ + reinterpret_cast< WCHAR * >( const_cast< sal_Unicode * >( aCurType.getStr() ) ) ); +#else ( sal_Unicode* )aCurType.getStr() ); +#endif if ( hr == S_OK ) { +#ifdef __MINGW32__ + hr = pStg->CreateStream( reinterpret_cast< const WCHAR * >( static_cast< const sal_Unicode * >( aOfficeEmbedStreamName ) ), +#else hr = pStg->CreateStream( aOfficeEmbedStreamName, +#endif STGM_CREATE | ( nStreamMode & 0x73 ), 0, 0, @@ -469,7 +486,11 @@ if ( hr == S_OK && m_pOwnStream ) { +#ifdef __MINGW32__ + hr = pStg->CreateStream( reinterpret_cast< const WCHAR * >( static_cast< const sal_Unicode * >( aExtentStreamName ) ), +#else hr = pStg->CreateStream( aExtentStreamName, +#endif STGM_CREATE | ( nStreamMode & 0x73 ), 0, 0, @@ -515,7 +536,11 @@ if ( FAILED( hr ) ) return E_FAIL; DWORD nStreamMode = aStat.grfMode; +#ifdef __MINGW32__ + hr = pStg->OpenStream( reinterpret_cast< const WCHAR * >( static_cast< const sal_Unicode * >( aOfficeEmbedStreamName ) ), +#else hr = pStg->OpenStream( aOfficeEmbedStreamName, +#endif 0, nStreamMode & 0x73, 0, @@ -524,7 +549,11 @@ if ( SUCCEEDED( hr ) ) { +#ifdef __MINGW32__ + hr = pStg->OpenStream( reinterpret_cast< const WCHAR * >( static_cast< const sal_Unicode * >( aExtentStreamName ) ), +#else hr = pStg->OpenStream( aExtentStreamName, +#endif 0, nStreamMode & 0x73, 0, @@ -591,10 +620,17 @@ if ( FAILED( hr ) ) { +#ifdef __MINGW32__ + m_pOwnStream = XWindowsComPtr< IStream >(); + m_pExtStream = XWindowsComPtr< IStream >(); + hr = pStg->DestroyElement( reinterpret_cast< const wchar_t * >( static_cast< const sal_Unicode * >( aOfficeEmbedStreamName ) ) ); + hr = pStg->DestroyElement( reinterpret_cast< const wchar_t * >( static_cast< const sal_Unicode * >( aExtentStreamName ) ) ); +#else m_pOwnStream = CComPtr< IStream >(); m_pExtStream = CComPtr< IStream >(); hr = pStg->DestroyElement( aOfficeEmbedStreamName ); hr = pStg->DestroyElement( aExtentStreamName ); +#endif OSL_ENSURE( SUCCEEDED( hr ), "Can not destroy created stream!\n" ); if ( FAILED( hr ) ) @@ -609,8 +645,13 @@ if ( !m_pDocHolder->GetDocument().is() || !m_xFactory.is() || !pStgSave || !m_pOwnStream || !m_pExtStream ) return E_FAIL; +#ifdef __MINGW32__ + XWindowsComPtr< IStream > pTargetStream; + XWindowsComPtr< IStream > pNewExtStream; +#else CComPtr< IStream > pTargetStream; CComPtr< IStream > pNewExtStream; +#endif if ( !fSameAsLoad && pStgSave != m_pMasterStorage ) { @@ -623,14 +664,22 @@ if ( FAILED( hr ) ) return E_FAIL; DWORD nStreamMode = aStat.grfMode; +#ifdef __MINGW32__ + hr = pStgSave->CreateStream( reinterpret_cast< const WCHAR * >( static_cast< const sal_Unicode * >( aOfficeEmbedStreamName ) ), +#else hr = pStgSave->CreateStream( aOfficeEmbedStreamName, +#endif STGM_CREATE | ( nStreamMode & 0x73 ), 0, 0, &pTargetStream ); if ( FAILED( hr ) || !pTargetStream ) return E_FAIL; +#ifdef __MINGW32__ + hr = pStgSave->CreateStream( reinterpret_cast< const WCHAR * >( static_cast< const sal_Unicode * >( aExtentStreamName ) ), +#else hr = pStgSave->CreateStream( aExtentStreamName, +#endif STGM_CREATE | ( nStreamMode & 0x73 ), 0, 0, @@ -684,8 +733,13 @@ if ( SUCCEEDED( hr ) ) { +#ifdef __MINGW32__ + m_pOwnStream = XWindowsComPtr< IStream >(); + m_pExtStream = XWindowsComPtr< IStream >(); +#else m_pOwnStream = CComPtr< IStream >(); m_pExtStream = CComPtr< IStream >(); +#endif if ( fSameAsLoad || pStgSave == m_pMasterStorage ) m_bIsDirty = sal_False; } @@ -721,14 +775,22 @@ if ( FAILED( hr ) ) return E_OUTOFMEMORY; DWORD nStreamMode = aStat.grfMode; +#ifdef __MINGW32__ + hr = m_pMasterStorage->OpenStream( reinterpret_cast< const WCHAR * >( static_cast< const sal_Unicode * >( aOfficeEmbedStreamName ) ), +#else hr = m_pMasterStorage->OpenStream( aOfficeEmbedStreamName, +#endif 0, nStreamMode & 0x73, 0, &m_pOwnStream ); if ( FAILED( hr ) || !m_pOwnStream ) return E_OUTOFMEMORY; +#ifdef __MINGW32__ + hr = m_pMasterStorage->OpenStream( reinterpret_cast< const WCHAR * >( static_cast< const sal_Unicode * >( aExtentStreamName ) ), +#else hr = m_pMasterStorage->OpenStream( aExtentStreamName, +#endif 0, nStreamMode & 0x73, 0, @@ -747,9 +809,15 @@ STDMETHODIMP EmbedDocument_Impl::HandsOffStorage() { +#ifdef __MINGW32__ + m_pMasterStorage = XWindowsComPtr< IStorage >(); + m_pOwnStream = XWindowsComPtr< IStream >(); + m_pExtStream = XWindowsComPtr< IStream >(); +#else m_pMasterStorage = CComPtr< IStorage >(); m_pOwnStream = CComPtr< IStream >(); m_pExtStream = CComPtr< IStream >(); +#endif return S_OK; } @@ -777,20 +845,32 @@ CLIPFORMAT cf = RegisterClipboardFormatA( "Embedded Object" ); hr = WriteFmtUserTypeStg( m_pMasterStorage, cf, // ??? +#ifdef __MINGW32__ + reinterpret_cast< WCHAR * >( const_cast< sal_Unicode * >( aCurType.getStr() ) ) ); +#else ( sal_Unicode* )aCurType.getStr() ); +#endif if ( FAILED( hr ) ) return E_FAIL; hr = m_pMasterStorage->SetClass( m_guid ); if ( FAILED( hr ) ) return E_FAIL; +#ifdef __MINGW32__ + hr = m_pMasterStorage->CreateStream( reinterpret_cast< const WCHAR * >( static_cast< const sal_Unicode * >( aOfficeEmbedStreamName ) ), +#else hr = m_pMasterStorage->CreateStream( aOfficeEmbedStreamName, +#endif STGM_CREATE | ( nStreamMode & 0x73 ), 0, 0, &m_pOwnStream ); if ( FAILED( hr ) || !m_pOwnStream ) return E_FAIL; +#ifdef __MINGW32__ + hr = m_pMasterStorage->CreateStream( reinterpret_cast< const WCHAR * >( static_cast< const sal_Unicode * >( aExtentStreamName ) ), +#else hr = m_pMasterStorage->CreateStream( aExtentStreamName, +#endif STGM_CREATE | ( nStreamMode & 0x73 ), 0, 0, @@ -815,8 +895,12 @@ pszFileName ) ); hr = S_OK; +#ifdef __MINGW32__ + m_aFileName = ::rtl::OUString( reinterpret_cast< const sal_Unicode * >( pszFileName ) ); +#else USES_CONVERSION; m_aFileName = ::rtl::OUString( OLE2CW( pszFileName ) ); +#endif } catch( uno::Exception& ) { @@ -829,7 +913,11 @@ CLIPFORMAT cf = RegisterClipboardFormatA( "Embedded Object" ); hr = WriteFmtUserTypeStg( m_pMasterStorage, cf, // ??? +#ifdef __MINGW32__ + reinterpret_cast< WCHAR * >( const_cast< sal_Unicode * >( aCurType.getStr() ) ) ); +#else ( sal_Unicode* )aCurType.getStr() ); +#endif if ( SUCCEEDED( hr ) ) { @@ -879,8 +967,12 @@ if ( !m_pDocHolder->GetDocument().is() || !m_xFactory.is() ) return E_FAIL; +#ifdef __MINGW32__ + ::rtl::OUString aTargetName = pszFileName ? ::rtl::OUString( reinterpret_cast< const sal_Unicode * >( pszFileName ) ) : m_aFileName; +#else USES_CONVERSION; ::rtl::OUString aTargetName = pszFileName ? ::rtl::OUString( OLE2CW( pszFileName ) ) : m_aFileName; +#endif if ( !aTargetName.getLength() ) return E_FAIL; @@ -906,19 +998,31 @@ STDMETHODIMP EmbedDocument_Impl::SaveCompleted( LPCOLESTR pszFileName ) { +#ifdef __MINGW32__ + m_aFileName = ::rtl::OUString( reinterpret_cast< const sal_Unicode * >( pszFileName ) ); +#else m_aFileName = ::rtl::OUString( OLE2CW( pszFileName ) ); +#endif return S_OK; } STDMETHODIMP EmbedDocument_Impl::GetCurFile( LPOLESTR *ppszFileName ) { +#ifdef __MINGW32__ + XWindowsComPtr pMalloc; +#else CComPtr pMalloc; +#endif HRESULT hr = CoGetMalloc( 1, &pMalloc ); if ( FAILED( hr ) || !pMalloc ) return E_FAIL; *ppszFileName = (LPOLESTR)( pMalloc->Alloc( sizeof( sal_Unicode ) * ( m_aFileName.getLength() + 1 ) ) ); +#ifdef __MINGW32__ + wcsncpy( *ppszFileName, reinterpret_cast< const WCHAR * >( m_aFileName.getStr() ), m_aFileName.getLength() + 1 ); +#else wcsncpy( *ppszFileName, m_aFileName.getStr(), m_aFileName.getLength() + 1 ); +#endif return m_aFileName.getLength() ? S_OK : S_FALSE; } --- ./embedserv/source/embed/docholder.cxx.orig 2003-06-16 20:36:08.000000000 +0900 +++ ./embedserv/source/embed/docholder.cxx 2003-12-23 17:36:34.000000000 +0900 @@ -130,9 +130,9 @@ // add mutex locking ??? DocumentHolder::DocumentHolder( const uno::Reference< lang::XMultiServiceFactory >& xFactory,EmbedDocument_Impl *pOLEInterface) - : m_xFactory( xFactory ), - m_pOLEInterface(pOLEInterface), - m_pInterceptor(0) + : m_pOLEInterface(pOLEInterface), + m_pInterceptor(0), + m_xFactory( xFactory ) { const ::rtl::OUString aServiceName ( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.frame.Desktop" ) ); uno::Reference< frame::XDesktop > xDesktop( m_xFactory->createInstance( aServiceName ), uno::UNO_QUERY ); @@ -599,6 +599,7 @@ } void SAL_CALL DocumentHolder::disposing( const com::sun::star::lang::EventObject& aSource ) + throw( uno::RuntimeException ) { if ( m_xDocument.is() && m_xDocument == aSource.Source ) { @@ -620,6 +621,7 @@ } void SAL_CALL DocumentHolder::notifyClosing( const lang::EventObject& aSource ) + throw( uno::RuntimeException ) { uno::Reference< util::XCloseBroadcaster > xEventBroadcaster( aSource.Source, uno::UNO_QUERY ); @@ -644,6 +646,7 @@ } void SAL_CALL DocumentHolder::notifyTermination( const lang::EventObject& aSource ) + throw( uno::RuntimeException ) { OSL_ENSURE( !m_xDocument.is(), "Just a disaster..." ); --- ./embedserv/source/embed/intercept.cxx.orig 2003-04-04 21:12:36.000000000 +0900 +++ ./embedserv/source/embed/intercept.cxx 2003-12-23 18:32:10.000000000 +0900 @@ -77,7 +77,7 @@ -uno::Sequence<::rtl::OUString> Interceptor::m_aInterceptedURL(IUL); +uno::Sequence< ::rtl::OUString > Interceptor::m_aInterceptedURL(IUL); @@ -144,6 +144,7 @@ void SAL_CALL Interceptor::dispose() + throw(::com::sun::star::uno::RuntimeException) { lang::EventObject aEvt; aEvt.Source = static_cast< frame::XDispatch* >( this ); @@ -167,8 +168,8 @@ DocumentHolder* pDocH) : m_pOLEInterface(pOLEInterface), m_pDocH(pDocH), - m_pStatCL(0), - m_pDisposeEventListeners(0) + m_pDisposeEventListeners(0), + m_pStatCL(0) { m_aInterceptedURL[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(".uno:Save")); --- ./embedserv/source/embed/esdll.cxx.orig 2003-04-10 23:55:58.000000000 +0900 +++ ./embedserv/source/embed/esdll.cxx 2003-12-23 19:13:52.000000000 +0900 @@ -66,12 +66,16 @@ #undef _DEBUG #endif +#ifdef __MINGW32__ +#include +#else #include CComModule _Module; #include BEGIN_OBJECT_MAP(ObjectMap) END_OBJECT_MAP() +#endif ///////////////////////////////////////////////////////////////////////////// // DLL Entry Point @@ -81,12 +85,16 @@ { if (dwReason == DLL_PROCESS_ATTACH) { +#ifndef __MINGW32__ _Module.Init(ObjectMap, hInstance, NULL); +#endif DisableThreadLibraryCalls(hInstance); } else if (dwReason == DLL_PROCESS_DETACH) { +#ifndef __MINGW32__ _Module.Term(); +#endif } return TRUE; // ok } --- ./embedserv/source/embed/register.cxx.orig 2003-04-24 22:54:42.000000000 +0900 +++ ./embedserv/source/embed/register.cxx 2003-12-23 19:45:32.000000000 +0900 @@ -61,6 +61,7 @@ //#include //#include +#define INITGUID #include "servprov.hxx" #ifndef _COM_SUN_STAR_LANG_XSINGLESERVICEFACTORY_HPP_ @@ -152,7 +153,7 @@ EmbedServer_getImplementationName() + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") ) ); - uno::Sequence< ::rtl::OUString > &rServices = EmbedServer_getSupportedServiceNames(); + const uno::Sequence< ::rtl::OUString > &rServices = EmbedServer_getSupportedServiceNames(); for( sal_Int32 ind = 0; ind < rServices.getLength(); ind++ ) xNewKey->createKey( rServices.getConstArray()[ind] ); --- ./i18n_simple/prj/d.lst.orig 2001-09-01 04:09:12.000000000 +0900 +++ ./i18n_simple/prj/d.lst 2004-01-13 23:03:40.000000000 +0900 @@ -2,6 +2,7 @@ ..\%__SRC%\bin\i18n?????.dll %_DEST%\bin%_EXT%\i18n?????.dll ..\%__SRC%\lib\libi18n?????.so %_DEST%\lib%_EXT%\libi18n?????.so +..\%__SRC%\lib\libi18n?????.a %_DEST%\lib%_EXT%\libi18n?????.a ..\%__SRC%\lib\libi18n??????.dylib %_DEST%\lib%_EXT%\libi18n??????.dylib ..\%__SRC%\lib\lib*static*.dylib %_DEST%\lib%_EXT%\lib*static*.dylib --- ./boost/prj/d.lst.orig 2003-06-12 20:10:36.000000000 +0900 +++ ./boost/prj/d.lst 2004-01-13 22:00:44.000000000 +0900 @@ -29,5 +29,6 @@ ..\%__SRC%\lib\*.lib %_DEST%\lib%_EXT%\*.lib ..\%__SRC%\lib\*.so %_DEST%\lib%_EXT%\*.so +..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll --- ./jvmaccess/prj/d.lst.orig 2003-07-17 02:25:26.000000000 +0900 +++ ./jvmaccess/prj/d.lst 2003-12-23 22:18:54.000000000 +0900 @@ -5,4 +5,5 @@ ..\%__SRC%\lib\ijvmaccess.lib %_DEST%\lib%_EXT%\ijvmaccess.lib ..\%__SRC%\lib\libjvmaccess*.so.*.*.* %_DEST%\lib%_EXT%\* ..\%__SRC%\lib\libjvmaccess*.dylib* %_DEST%\lib%_EXT%\* +..\%__SRC%\lib\libjvmaccess*.a %_DEST%\lib%_EXT%\* linklib: libjvmaccess*.so.*.*.* --- ./curl/unx1-curl-7.9.8.patch.orig 2003-03-20 02:37:52.000000000 +0900 +++ ./curl/unx1-curl-7.9.8.patch 2003-11-16 19:59:52.000000000 +0900 @@ -36,201 +36,1245 @@ # This flag accepts an argument of the form current[:revision[:age]]. So, # passing -version-info 3:12:1 sets current to 3, revision to 12, and age to -*** misc/curl-7.9.8/lib/easy.c Tue May 7 11:58:14 2002 ---- misc/build/curl-7.9.8/lib/easy.c Fri Nov 8 10:46:41 2002 -*************** -*** 307,313 **** - - outcurl->progress.flags = data->progress.flags; - outcurl->progress.callback = data->progress.callback; -! - if(data->cookies) - /* If cookies are enabled in the parent handle, we enable them - in the clone as well! */ ---- 307,313 ---- - - outcurl->progress.flags = data->progress.flags; - outcurl->progress.callback = data->progress.callback; -! #ifndef CURL_DISABLE_HTTP - if(data->cookies) - /* If cookies are enabled in the parent handle, we enable them - in the clone as well! */ -*************** -*** 314,320 **** - outcurl->cookies = Curl_cookie_init(data->cookies->filename, - outcurl->cookies, - data->set.cookiesession); -! - /* duplicate all values in 'change' */ - if(data->change.url) { - outcurl->change.url = strdup(data->change.url); ---- 314,320 ---- - outcurl->cookies = Curl_cookie_init(data->cookies->filename, - outcurl->cookies, - data->set.cookiesession); -! #endif - /* duplicate all values in 'change' */ - if(data->change.url) { - outcurl->change.url = strdup(data->change.url); -*** misc/curl-7.9.8/lib/ftp.c Thu Jun 13 11:21:08 2002 ---- misc/build/curl-7.9.8/lib/ftp.c Fri Nov 8 10:46:02 2002 -*************** -*** 441,447 **** - /* no need to duplicate them, the data struct won't change */ - ftp->user = data->state.user; - ftp->passwd = data->state.passwd; -! - if (data->set.tunnel_thru_httpproxy) { - /* We want "seamless" FTP operations through HTTP proxy tunnel */ - result = Curl_ConnectHTTPProxyTunnel(conn, conn->firstsocket, ---- 441,447 ---- - /* no need to duplicate them, the data struct won't change */ - ftp->user = data->state.user; - ftp->passwd = data->state.passwd; -! #ifndef CURL_DISABLE_HTTP - if (data->set.tunnel_thru_httpproxy) { - /* We want "seamless" FTP operations through HTTP proxy tunnel */ - result = Curl_ConnectHTTPProxyTunnel(conn, conn->firstsocket, -*************** -*** 449,455 **** - if(CURLE_OK != result) - return result; - } -! - if(conn->protocol & PROT_FTPS) { - /* FTPS is simply ftp with SSL for the control channel */ - /* now, perform the SSL initialization for this socket */ ---- 449,455 ---- - if(CURLE_OK != result) - return result; - } -! #endif - if(conn->protocol & PROT_FTPS) { - /* FTPS is simply ftp with SSL for the control channel */ - /* now, perform the SSL initialization for this socket */ -*************** -*** 1491,1497 **** - - if(CURLE_OK != result) - return result; -! - if (data->set.tunnel_thru_httpproxy) { - /* We want "seamless" FTP operations through HTTP proxy tunnel */ - result = Curl_ConnectHTTPProxyTunnel(conn, conn->secondarysocket, ---- 1491,1497 ---- - - if(CURLE_OK != result) - return result; -! #ifndef CURL_DISABLE_HTTP - if (data->set.tunnel_thru_httpproxy) { - /* We want "seamless" FTP operations through HTTP proxy tunnel */ - result = Curl_ConnectHTTPProxyTunnel(conn, conn->secondarysocket, -*************** -*** 1499,1505 **** - if(CURLE_OK != result) - return result; - } -! - return CURLE_OK; - } - ---- 1499,1505 ---- - if(CURLE_OK != result) - return result; - } -! #endif - return CURLE_OK; - } - -*** misc/curl-7.9.8/lib/transfer.c Thu Jun 13 10:12:22 2002 ---- misc/build/curl-7.9.8/lib/transfer.c Fri Nov 8 10:50:34 2002 -*************** -*** 568,577 **** ---- 568,579 ---- - * with the previously mentioned size. There can be any amount - * of chunks, and a chunk-data set to zero signals the - * end-of-chunks. */ -+ #ifndef CURL_DISABLE_HTTP - conn->bits.chunk = TRUE; /* chunks coming our way */ - - /* init our chunky engine */ - Curl_httpchunk_init(conn); -+ #endif - } - else if (strnequal("Content-Range:", k->p, 14)) { - if (sscanf (k->p+14, " bytes %d-", &k->offset) || -*************** -*** 585,594 **** ---- 587,598 ---- - } - } - } -+ #ifndef CURL_DISABLE_HTTP - else if(data->cookies && - strnequal("Set-Cookie:", k->p, 11)) { - Curl_cookie_add(data->cookies, TRUE, k->p+12, conn->name); - } -+ #endif - else if(strnequal("Last-Modified:", k->p, - strlen("Last-Modified:")) && - (data->set.timecondition || data->set.get_filetime) ) { -*************** -*** 735,743 **** - * the name says read, this function both reads and writes away - * the data. The returned 'nread' holds the number of actual - * data it wrote to the client. */ - CHUNKcode res = - Curl_httpchunk_read(conn, k->str, nread, &nread); -! - if(CHUNKE_OK < res) { - if(CHUNKE_WRITE_ERROR == res) { - failf(data, "Failed writing data"); ---- 739,750 ---- - * the name says read, this function both reads and writes away - * the data. The returned 'nread' holds the number of actual - * data it wrote to the client. */ -+ #ifndef CURL_DISABLE_HTTP - CHUNKcode res = - Curl_httpchunk_read(conn, k->str, nread, &nread); -! #else -! CHUNKcode res = CHUNKE_OK; -! #endif - if(CHUNKE_OK < res) { - if(CHUNKE_WRITE_ERROR == res) { - failf(data, "Failed writing data"); -*** misc/curl-7.9.8/lib/url.c Tue Jun 11 17:47:01 2002 ---- misc/build/curl-7.9.8/lib/url.c Fri Nov 8 10:43:55 2002 -*************** -*** 1598,1604 **** - conn->ppath = conn->path; - conn->hostname = conn->name; - -! - /************************************************************* - * Detect what (if any) proxy to use - *************************************************************/ ---- 1598,1604 ---- - conn->ppath = conn->path; - conn->hostname = conn->name; - -! #if 0 - /************************************************************* - * Detect what (if any) proxy to use - *************************************************************/ -*************** -*** 1708,1714 **** - if(no_proxy) - free(no_proxy); - } /* if not using proxy */ -! - /************************************************************* - * No protocol part in URL was used, add it! - *************************************************************/ ---- 1708,1714 ---- - if(no_proxy) - free(no_proxy); - } /* if not using proxy */ -! #endif - /************************************************************* - * No protocol part in URL was used, add it! - *************************************************************/ +--- misc/build/curl-7.9.8/lib/http.c.orig 2002-06-11 20:13:02.000000000 +0900 ++++ misc/build/curl-7.9.8/lib/http.c 2003-11-16 19:39:10.000000000 +0900 +@@ -36,7 +36,11 @@ + #include + + #if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__) ++#ifdef HAVE_WINSOCK2_H ++#include ++#else + #include ++#endif + #include + #include + #else +--- misc/build/curl-7.9.8/lib/file.c.orig 2002-06-11 20:13:02.000000000 +0900 ++++ misc/build/curl-7.9.8/lib/file.c 2003-11-16 19:39:08.000000000 +0900 +@@ -36,7 +36,11 @@ + #include + + #if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__) ++#ifdef HAVE_WINSOCK2_H ++#include ++#else + #include ++#endif + #include + #include + #include +--- misc/build/curl-7.9.8/lib/easy.c.orig 2002-05-07 18:58:14.000000000 +0900 ++++ misc/build/curl-7.9.8/lib/easy.c 2003-11-16 19:39:14.000000000 +0900 +@@ -37,7 +37,11 @@ + #include "strequal.h" + + #if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__) ++#ifdef HAVE_WINSOCK2_H ++#include ++#else + #include ++#endif + #include + #include + #else +@@ -307,14 +311,14 @@ + + outcurl->progress.flags = data->progress.flags; + outcurl->progress.callback = data->progress.callback; +- ++#ifndef CURL_DISABLE_HTTP + if(data->cookies) + /* If cookies are enabled in the parent handle, we enable them + in the clone as well! */ + outcurl->cookies = Curl_cookie_init(data->cookies->filename, + outcurl->cookies, + data->set.cookiesession); +- ++#endif + /* duplicate all values in 'change' */ + if(data->change.url) { + outcurl->change.url = strdup(data->change.url); +--- misc/build/curl-7.9.8/lib/ftp.c.orig 2002-06-13 18:21:08.000000000 +0900 ++++ misc/build/curl-7.9.8/lib/ftp.c 2003-11-16 19:39:24.000000000 +0900 +@@ -40,7 +40,14 @@ + #endif + + #if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__) ++#ifdef HAVE_WS2TCPIP_H ++#include ++#endif ++#ifdef HAVE_WINSOCK2_H ++#include ++#else + #include ++#endif + #else /* some kind of unix */ + #ifdef HAVE_SYS_SOCKET_H + #include +@@ -441,7 +448,7 @@ + /* no need to duplicate them, the data struct won't change */ + ftp->user = data->state.user; + ftp->passwd = data->state.passwd; +- ++#ifndef CURL_DISABLE_HTTP + if (data->set.tunnel_thru_httpproxy) { + /* We want "seamless" FTP operations through HTTP proxy tunnel */ + result = Curl_ConnectHTTPProxyTunnel(conn, conn->firstsocket, +@@ -449,7 +456,7 @@ + if(CURLE_OK != result) + return result; + } +- ++#endif + if(conn->protocol & PROT_FTPS) { + /* FTPS is simply ftp with SSL for the control channel */ + /* now, perform the SSL initialization for this socket */ +@@ -1491,7 +1498,7 @@ + + if(CURLE_OK != result) + return result; +- ++#ifndef CURL_DISABLE_HTTP + if (data->set.tunnel_thru_httpproxy) { + /* We want "seamless" FTP operations through HTTP proxy tunnel */ + result = Curl_ConnectHTTPProxyTunnel(conn, conn->secondarysocket, +@@ -1499,7 +1506,7 @@ + if(CURLE_OK != result) + return result; + } +- ++#endif + return CURLE_OK; + } + +--- misc/build/curl-7.9.8/lib/transfer.c.orig 2002-06-13 17:12:22.000000000 +0900 ++++ misc/build/curl-7.9.8/lib/transfer.c 2003-11-16 19:39:16.000000000 +0900 +@@ -37,7 +37,11 @@ + #include "strequal.h" + + #if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__) ++#ifdef HAVE_WINSOCK2_H ++#include ++#else + #include ++#endif + #include + #include + #else +@@ -568,10 +572,12 @@ + * with the previously mentioned size. There can be any amount + * of chunks, and a chunk-data set to zero signals the + * end-of-chunks. */ ++#ifndef CURL_DISABLE_HTTP + conn->bits.chunk = TRUE; /* chunks coming our way */ + + /* init our chunky engine */ + Curl_httpchunk_init(conn); ++#endif + } + else if (strnequal("Content-Range:", k->p, 14)) { + if (sscanf (k->p+14, " bytes %d-", &k->offset) || +@@ -585,10 +591,12 @@ + } + } + } ++#ifndef CURL_DISABLE_HTTP + else if(data->cookies && + strnequal("Set-Cookie:", k->p, 11)) { + Curl_cookie_add(data->cookies, TRUE, k->p+12, conn->name); + } ++#endif + else if(strnequal("Last-Modified:", k->p, + strlen("Last-Modified:")) && + (data->set.timecondition || data->set.get_filetime) ) { +@@ -735,9 +743,12 @@ + * the name says read, this function both reads and writes away + * the data. The returned 'nread' holds the number of actual + * data it wrote to the client. */ ++#ifndef CURL_DISABLE_HTTP + CHUNKcode res = + Curl_httpchunk_read(conn, k->str, nread, &nread); +- ++#else ++ CHUNKcode res = CHUNKE_OK; ++#endif + if(CHUNKE_OK < res) { + if(CHUNKE_WRITE_ERROR == res) { + failf(data, "Failed writing data"); +--- misc/build/curl-7.9.8/lib/url.c.orig 2002-06-12 00:47:02.000000000 +0900 ++++ misc/build/curl-7.9.8/lib/url.c 2003-11-16 19:39:26.000000000 +0900 +@@ -36,7 +36,14 @@ + #include + + #if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__) ++#ifdef HAVE_WS2TCPIP_H ++#include ++#endif ++#ifdef HAVE_WINSOCK2_H ++#include ++#else + #include ++#endif + #include + #include + #else +@@ -1598,7 +1605,7 @@ + conn->ppath = conn->path; + conn->hostname = conn->name; + +- ++#if 0 + /************************************************************* + * Detect what (if any) proxy to use + *************************************************************/ +@@ -1708,7 +1715,7 @@ + if(no_proxy) + free(no_proxy); + } /* if not using proxy */ +- ++#endif + /************************************************************* + * No protocol part in URL was used, add it! + *************************************************************/ +@@ -2264,7 +2271,7 @@ + * Store the old value to be able to set it back later! + *************************************************************/ + +-#ifdef HAVE_SIGACTION ++#if defined(HAVE_SIGACTION) && defined(SIGALRM) + struct sigaction sigact; + sigaction(SIGALRM, NULL, &sigact); + keep_sigact = sigact; +@@ -2278,7 +2285,7 @@ + sigaction(SIGALRM, &sigact, NULL); + #else + /* no sigaction(), revert to the much lamer signal() */ +-#ifdef HAVE_SIGNAL ++#if defined(HAVE_SIGNAL) && defined(SIGALRM) + keep_sigact = signal(SIGALRM, alarmfunc); + #endif + #endif +--- misc/build/curl-7.9.8/lib/speedcheck.c.orig 2002-03-19 16:54:56.000000000 +0900 ++++ misc/build/curl-7.9.8/lib/speedcheck.c 2003-11-16 19:38:58.000000000 +0900 +@@ -26,8 +26,12 @@ + #include + #include + #if defined(__MINGW32__) ++#ifdef HAVE_WINSOCK2_H ++#include ++#else + #include + #endif ++#endif + + #include + #include "urldata.h" +--- misc/build/curl-7.9.8/lib/dict.c.orig 2002-03-19 16:54:56.000000000 +0900 ++++ misc/build/curl-7.9.8/lib/dict.c 2003-11-16 19:38:56.000000000 +0900 +@@ -35,7 +35,11 @@ + #include + + #if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__) ++#ifdef HAVE_WINSOCK2_H ++#include ++#else + #include ++#endif + #include + #include + #else +--- misc/build/curl-7.9.8/lib/progress.c.orig 2002-06-03 21:46:04.000000000 +0900 ++++ misc/build/curl-7.9.8/lib/progress.c 2003-11-16 19:39:06.000000000 +0900 +@@ -27,8 +27,12 @@ + + #if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__) + #if defined(__MINGW32__) ++#ifdef HAVE_WINSOCK2_H ++#include ++#else + #include + #endif ++#endif + #include + #endif + +--- misc/build/curl-7.9.8/lib/memdebug.c.orig 2002-05-22 19:04:18.000000000 +0900 ++++ misc/build/curl-7.9.8/lib/memdebug.c 2003-11-16 19:39:04.000000000 +0900 +@@ -27,7 +27,11 @@ + #include + + #if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__) ++#ifdef HAVE_WINSOCK2_H ++#include ++#else + #include ++#endif + #else /* some kind of unix */ + #ifdef HAVE_SYS_SOCKET_H + #include +--- misc/build/curl-7.9.8/lib/timeval.h.orig 2002-03-19 16:54:56.000000000 +0900 ++++ misc/build/curl-7.9.8/lib/timeval.h 2003-11-16 19:41:06.000000000 +0900 +@@ -27,7 +27,11 @@ + + #if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__) + #include ++#ifdef HAVE_WINSOCK2_H ++#include ++#else + #include ++#endif + #else + #include + #endif +--- misc/build/curl-7.9.8/lib/sendf.c.orig 2002-05-06 22:33:40.000000000 +0900 ++++ misc/build/curl-7.9.8/lib/sendf.c 2003-11-16 19:39:02.000000000 +0900 +@@ -40,8 +40,12 @@ + #include + #endif + #if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__) ++#ifdef HAVE_WINSOCK2_H ++#include ++#else + #include + #endif ++#endif + + #include + #include "urldata.h" +--- misc/build/curl-7.9.8/lib/config.h.in.orig 2002-06-12 00:19:26.000000000 +0900 ++++ misc/build/curl-7.9.8/lib/config.h.in 2003-11-04 00:57:06.000000000 +0900 +@@ -423,3 +423,9 @@ + + /* Define to `int' if does not define. */ + #undef ssize_t ++ ++/* Define if you have the header file. */ ++#undef HAVE_WINSOCK2_H ++ ++/* Define if you have the header file. */ ++#undef HAVE_WS2TCPIP_H +--- misc/build/curl-7.9.8/lib/hostip.c.orig 2002-06-12 00:10:38.000000000 +0900 ++++ misc/build/curl-7.9.8/lib/hostip.c 2003-11-16 19:39:22.000000000 +0900 +@@ -29,7 +29,14 @@ + #define _REENTRANT + + #if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__) ++#ifdef HAVE_WS2TCPIP_H ++#include ++#endif ++#ifdef HAVE_WINSOCK2_H ++#include ++#else + #include ++#endif + #else + #ifdef HAVE_SYS_TYPES_H + #include +--- misc/build/curl-7.9.8/lib/connect.c.orig 2002-06-12 18:48:26.000000000 +0900 ++++ misc/build/curl-7.9.8/lib/connect.c 2003-11-16 19:39:28.000000000 +0900 +@@ -63,13 +63,21 @@ + #define FALSE 0 + #endif + +-#ifdef WIN32 ++#if defined(WIN32) || defined(__MINGW32__) + #define HAVE_IOCTLSOCKET + #include ++#ifdef HAVE_WS2TCPIP_H ++#include ++#endif ++#ifdef HAVE_WINSOCK2_H ++#include ++#else + #include ++#endif + #define EINPROGRESS WSAEINPROGRESS + #define EWOULDBLOCK WSAEWOULDBLOCK + #define EISCONN WSAEISCONN ++#define ECONNREFUSED WSAECONNREFUSED + #endif + + #include "urldata.h" +@@ -84,7 +92,7 @@ + static + int geterrno(void) + { +-#ifdef WIN32 ++#if defined(WIN32) || defined(__MINGW32__) + return (int)GetLastError(); + #else + return errno; +--- misc/build/curl-7.9.8/src/main.c.orig 2002-06-12 00:10:40.000000000 +0900 ++++ misc/build/curl-7.9.8/src/main.c 2003-11-16 19:39:12.000000000 +0900 +@@ -46,8 +46,12 @@ + #define CURLseparator "--_curl_--" + + #if defined(WIN32)&&!defined(__CYGWIN32__) ++#ifdef HAVE_WINSOCK2_H ++#include ++#else + #include + #endif ++#endif + + #include "version.h" + +--- misc/build/curl-7.9.8/include/curl/multi.h.orig 2002-03-19 19:34:34.000000000 +0900 ++++ misc/build/curl-7.9.8/include/curl/multi.h 2003-11-16 19:41:08.000000000 +0900 +@@ -51,8 +51,12 @@ + #include + #endif + #if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__) ++#ifdef HAVE_WINSOCK2_H ++#include ++#else + #include + #endif ++#endif + + #include + +--- misc/build/curl-7.9.8/configure.orig 2002-06-12 00:16:54.000000000 +0900 ++++ misc/build/curl-7.9.8/configure 2003-11-16 19:10:12.000000000 +0900 +@@ -4067,7 +4067,7 @@ + echo "${ECHO_T}ok" >&6 + fi + +-for ac_header in dlfcn.h ++for ac_header in dlfcn.h arpa/inet.h netdb.h sys/socket.h winsock2.h ws2tcpip.h + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` + echo "$as_me:4073: checking for $ac_header" >&5 +@@ -5532,20 +5532,21 @@ + else $CC -o impgen impgen.c ; fi)~ + $output_objdir/impgen $dir/$soroot > $output_objdir/$soname-def' + ++ old_archive_from_new_cmds='$DLLTOOL --as=$AS --dllname $soname --def $objdir/$soname-def --output-lib $objdir/$libname.a' + old_archive_from_expsyms_cmds='$DLLTOOL --as=$AS --dllname $soname --def $output_objdir/$soname-def --output-lib $output_objdir/$newlib' + + # cygwin and mingw dlls have different entry points and sets of symbols + # to exclude. + # FIXME: what about values for MSVC? +- dll_entry=__cygwin_dll_entry@12 +- dll_exclude_symbols=DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12~ +- case $host_os in +- mingw*) ++# dll_entry=__cygwin_dll_entry@12 ++# dll_exclude_symbols=DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12~ ++# case $host_os in ++# mingw*) + # mingw values + dll_entry=_DllMainCRTStartup@12 + dll_exclude_symbols=DllMain@12,DllMainCRTStartup@12,DllEntryPoint@12~ +- ;; +- esac ++# ;; ++# esac + + # mingw and cygwin differ, and it's simplest to just exclude the union + # of the two symbol sets. +@@ -6246,18 +6247,19 @@ + need_version=no + need_lib_prefix=no + case $GCC,$host_os in +- yes,cygwin*) +- library_names_spec='$libname.dll.a' +- soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll' +- postinstall_cmds='dlpath=`bash 2>&1 -c '\''. $dir/${file}i;echo \$dlname'\''`~ +- dldir=$destdir/`dirname \$dlpath`~ +- test -d \$dldir || mkdir -p \$dldir~ +- $install_prog .libs/$dlname \$dldir/$dlname' +- postuninstall_cmds='dldll=`bash 2>&1 -c '\''. $file; echo \$dlname'\''`~ +- dlpath=$dir/\$dldll~ +- $rm \$dlpath' +- ;; +- yes,mingw*) ++# yes,cygwin*) ++# library_names_spec='$libname.dll.a' ++# soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll' ++# postinstall_cmds='dlpath=`bash 2>&1 -c '\''. $dir/${file}i;echo \$dlname'\''`~ ++# dldir=$destdir/`dirname \$dlpath`~ ++# test -d \$dldir || mkdir -p \$dldir~ ++# $install_prog .libs/$dlname \$dldir/$dlname' ++# postuninstall_cmds='dldll=`bash 2>&1 -c '\''. $file; echo \$dlname'\''`~ ++# dlpath=$dir/\$dldll~ ++# $rm \$dlpath' ++# ;; ++# yes,mingw*) ++ yes,cygwin*|mingw*) + library_names_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll' + sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g"` + ;; +@@ -8026,7 +8028,9 @@ + #include "confdefs.h" + /* is AF_INET6 available? */ + #include ++#if HAVE_SYS_SOCKET_H + #include ++#endif + main() + { + if (socket(AF_INET6, SOCK_STREAM, 0) < 0) +@@ -8079,14 +8083,40 @@ + #line 8079 "configure" + #include "confdefs.h" + ++#if HAVE_NETDB_H + #include ++#endif + #include ++#if HAVE_SYS_SOCKET_H + #include ++#endif ++#if HAVE_WINSOCK2_H ++#include ++#endif ++#if HAVE_WS2TCPIP_H ++#include ++#endif ++ ++#ifdef __WIN32__ ++void cleanup(void) {WSACleanup();} ++#endif + + void main(void) { + struct addrinfo hints, *ai; + int error; + ++#ifdef __WIN32__ ++ WORD wVersionRequested; ++ WSADATA wsaData; ++ int err; ++ wVersionRequested = MAKEWORD( 2, 0 ); ++ err = WSAStartup( wVersionRequested, &wsaData ); ++ if ( err != 0 ) { ++ exit(1); ++ } ++ atexit(cleanup); ++#endif ++ + memset(&hints, 0, sizeof(hints)); + hints.ai_family = AF_UNSPEC; + hints.ai_socktype = SOCK_STREAM; +@@ -8160,8 +8190,13 @@ + #endif + /* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +-char gethostbyname (); +-char (*f) (); ++#ifdef __MINGW32__ ++#define __STDCALL__ __attribute__((__stdcall__)) ++#else ++#define __STDCALL__ ++#endif ++__STDCALL__ char gethostbyname (const char *); ++__STDCALL__ char (*f) (const char *); + + int + main () +@@ -8222,11 +8257,16 @@ + #endif + /* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +-char gethostbyname (); ++#ifdef __MINGW32__ ++#define __STDCALL__ __attribute__((__stdcall__)) ++#else ++#define __STDCALL__ ++#endif ++__STDCALL__ char gethostbyname (const char *); + int + main () + { +-gethostbyname (); ++gethostbyname ("dummy"); + ; + return 0; + } +@@ -8283,8 +8323,13 @@ + #endif + /* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +-char gethostbyname (); +-char (*f) (); ++#ifdef __MINGW32__ ++#define __STDCALL__ __attribute__((__stdcall__)) ++#else ++#define __STDCALL__ ++#endif ++__STDCALL__ char gethostbyname (const char *); ++__STDCALL__ char (*f) (const char *); + + int + main () +@@ -8345,11 +8390,16 @@ + #endif + /* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +-char gethostbyname (); ++#ifdef __MINGW32__ ++#define __STDCALL__ __attribute__((__stdcall__)) ++#else ++#define __STDCALL__ ++#endif ++__STDCALL__ char gethostbyname (const char *); + int + main () + { +-gethostbyname (); ++gethostbyname ("dummy"); + ; + return 0; + } +@@ -8398,11 +8448,17 @@ + cat >conftest.$ac_ext <<_ACEOF + #line 8399 "configure" + #include "confdefs.h" ++#ifdef __MINGW32__ ++#define __STDCALL__ __attribute__((__stdcall__)) ++#else ++#define __STDCALL__ ++#endif ++__STDCALL__ char gethostbyname (const char *); + + int + main () + { +-gethostbyname(); ++gethostbyname("dummy"); + ; + return 0; + } +@@ -8635,8 +8691,13 @@ + #endif + /* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +-char connect (); +-char (*f) (); ++#ifdef __MINGW32__ ++#define __STDCALL__ __attribute__((__stdcall__)) ++#else ++#define __STDCALL__ ++#endif ++__STDCALL__ char connect (int, struct a *, int); ++__STDCALL__ char (*f) (int, struct a *, int); + + int + main () +@@ -8697,11 +8758,17 @@ + #endif + /* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +-char connect (); ++#ifdef __MINGW32__ ++#define __STDCALL__ __attribute__((__stdcall__)) ++#else ++#define __STDCALL__ ++#endif ++__STDCALL__ char connect (int, int *, int); + int + main () + { +-connect (); ++int n; ++connect (n, &n, n); + ; + return 0; + } +@@ -8757,8 +8824,13 @@ + #endif + /* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +-char gethostname (); +-char (*f) (); ++#ifdef __MINGW32__ ++#define __STDCALL__ __attribute__((__stdcall__)) ++#else ++#define __STDCALL__ ++#endif ++__STDCALL__ char gethostname (char *, int); ++__STDCALL__ char (*f) (char *, int); + + int + main () +@@ -8799,7 +8871,10 @@ + echo "$as_me:8799: result: $ac_cv_func_gethostname" >&5 + echo "${ECHO_T}$ac_cv_func_gethostname" >&6 + if test $ac_cv_func_gethostname = yes; then +- : ++ cat >>confdefs.h <&5 +@@ -8853,6 +8928,7 @@ + echo "${ECHO_T}$ac_cv_lib_ucb_gethostname" >&6 + if test $ac_cv_lib_ucb_gethostname = yes; then + cat >>confdefs.h < + #include ++#if HAVE_NETDB_H + #include ++#endif + #undef NULL + #define NULL (void *)0 + +@@ -10720,7 +10798,9 @@ + + #include + #include ++#if HAVE_NETDB_H + #include ++#endif + #undef NULL + #define NULL (void *)0 + +@@ -10773,7 +10853,9 @@ + #include "confdefs.h" + + #include ++#if HAVE_NETDB_H + #include ++#endif + #undef NULL + #define NULL (void *)0 + +@@ -10821,7 +10903,9 @@ + #include "confdefs.h" + + #include ++#if HAVE_NETDB_H + #include ++#endif + #undef NULL + #define NULL (void *)0 + +@@ -10956,7 +11040,9 @@ + #include "confdefs.h" + + #include ++#if HAVE_NETDB_H + #include ++#endif + int + main () + { +@@ -11006,7 +11092,9 @@ + + #define _REENTRANT + #include ++#if HAVE_NETDB_H + #include ++#endif + int + main () + { +@@ -11059,7 +11147,9 @@ + #include "confdefs.h" + + #include ++#if HAVE_NETDB_H + #include ++#endif + int + main () + { +@@ -11111,7 +11201,9 @@ + #include "confdefs.h" + + #include ++#if HAVE_NETDB_H + #include ++#endif + int + main () + { +@@ -11241,7 +11333,10 @@ + #line 11241 "configure" + #include "confdefs.h" + ++#if HAVE_ARPA_INET_H + #include ++#endif ++ + _ACEOF + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "inet_ntoa_r" >/dev/null 2>&1; then +@@ -11263,7 +11358,9 @@ + #include "confdefs.h" + + #define _REENTRANT ++#if HAVE_ARPA_INET_H + #include ++#endif + _ACEOF + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "inet_ntoa_r" >/dev/null 2>&1; then +@@ -11634,7 +11731,8 @@ + fcntl.h \ + dlfcn.h \ + alloca.h \ +- winsock.h \ ++ winsock2.h \ ++ ws2tcpip.h \ + time.h \ + io.h \ + pwd.h \ +@@ -12092,7 +12190,15 @@ + #line 12092 "configure" + #include "confdefs.h" + #include ++#if HAVE_SYS_SOCKET_H + #include ++#endif ++#if HAVE_WINSOCK2_H ++#include ++#endif ++#if HAVE_WS2TCPIP_H ++#include ++#endif + + int + main () +@@ -12147,7 +12253,12 @@ + #include "confdefs.h" + + #include ++#if HAVE_SYS_SOCKET_H + #include ++#endif ++#if HAVE_WINSOCK2_H ++#include ++#endif + + int getpeername (int, $arg2 *, $t *); + +@@ -12212,8 +12323,15 @@ + #line 12212 "configure" + #include "confdefs.h" + #include ++#if HAVE_SYS_SOCKET_H + #include ++#endif ++#if HAVE_WINSOCK2_H ++#include ++#endif ++#if HAVE_ARPA_INET_H + #include ++#endif + + int + main () +@@ -12267,8 +12385,15 @@ + #include "confdefs.h" + + #include ++#if HAVE_SYS_SOCKET_H + #include ++#endif ++#if HAVE_WINSOCK2_H ++#include ++#endif ++#if HAVE_ARPA_INET_H + #include ++#endif + + int + main () +@@ -12374,9 +12499,368 @@ + #define RETSIGTYPE $ac_cv_type_signal + EOF + +-for ac_func in socket \ +- select \ +- strdup \ ++echo "$as_me:8621: checking for socket" >&5 ++echo $ECHO_N "checking for socket... $ECHO_C" >&6 ++if test "${ac_cv_func_socket+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++#line 8627 "configure" ++#include "confdefs.h" ++/* System header to define __stub macros and hopefully few prototypes, ++ which can conflict with char socket (); below. */ ++#include ++/* Override any gcc2 internal prototype to avoid an error. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++/* We use char because int might match the return type of a gcc2 ++ builtin and then its argument prototype would still apply. */ ++#ifdef __MINGW32__ ++#define __STDCALL__ __attribute__((__stdcall__)) ++#else ++#define __STDCALL__ ++#endif ++__STDCALL__ char socket (int, int, int); ++__STDCALL__ char (*f) (int, int, int); ++ ++int ++main () ++{ ++/* The GNU C library defines this for functions which it implements ++ to always fail with ENOSYS. Some functions are actually named ++ something starting with __ and the normal name is an alias. */ ++#if defined (__stub_socket) || defined (__stub___socket) ++choke me ++#else ++f = socket; ++#endif ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (eval echo "$as_me:8658: \"$ac_link\"") >&5 ++ (eval $ac_link) 2>&5 ++ ac_status=$? ++ echo "$as_me:8661: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (eval echo "$as_me:8664: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:8667: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_func_socket=yes ++else ++ echo "$as_me: failed program was:" >&5 ++cat conftest.$ac_ext >&5 ++ac_cv_func_socket=no ++fi ++rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++fi ++echo "$as_me:8677: result: $ac_cv_func_socket" >&5 ++echo "${ECHO_T}$ac_cv_func_socket" >&6 ++if test "$ac_cv_func_socket" = yes; then ++ cat >>confdefs.h <&5 ++echo $ECHO_N "checking for select... $ECHO_C" >&6 ++if test "${ac_cv_func_select+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++#line 8627 "configure" ++#include "confdefs.h" ++/* System header to define __stub macros and hopefully few prototypes, ++ which can conflict with char select (); below. */ ++#include ++/* Override any gcc2 internal prototype to avoid an error. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++/* We use char because int might match the return type of a gcc2 ++ builtin and then its argument prototype would still apply. */ ++#ifdef __MINGW32__ ++#define __STDCALL__ __attribute__((__stdcall__)) ++#else ++#define __STDCALL__ ++#endif ++__STDCALL__ char select (int, int *, int *, int *, int *); ++__STDCALL__ char (*f) (int, int *, int *, int *, int *); ++ ++int ++main () ++{ ++/* The GNU C library defines this for functions which it implements ++ to always fail with ENOSYS. Some functions are actually named ++ something starting with __ and the normal name is an alias. */ ++#if defined (__stub_select) || defined (__stub___select) ++choke me ++#else ++f = select; ++#endif ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (eval echo "$as_me:8658: \"$ac_link\"") >&5 ++ (eval $ac_link) 2>&5 ++ ac_status=$? ++ echo "$as_me:8661: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (eval echo "$as_me:8664: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:8667: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_func_select=yes ++else ++ echo "$as_me: failed program was:" >&5 ++cat conftest.$ac_ext >&5 ++ac_cv_func_select=no ++fi ++rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++fi ++echo "$as_me:8677: result: $ac_cv_func_select" >&5 ++echo "${ECHO_T}$ac_cv_func_select" >&6 ++if test "$ac_cv_func_select" = yes; then ++ cat >>confdefs.h <&5 ++echo $ECHO_N "checking for gethostbyaddr... $ECHO_C" >&6 ++if test "${ac_cv_func_gethostbyaddr+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++#line 8627 "configure" ++#include "confdefs.h" ++/* System header to define __stub macros and hopefully few prototypes, ++ which can conflict with char gethostbyaddr (); below. */ ++#include ++/* Override any gcc2 internal prototype to avoid an error. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++/* We use char because int might match the return type of a gcc2 ++ builtin and then its argument prototype would still apply. */ ++#ifdef __MINGW32__ ++#define __STDCALL__ __attribute__((__stdcall__)) ++#else ++#define __STDCALL__ ++#endif ++__STDCALL__ char gethostbyaddr (const char *, int, int); ++__STDCALL__ char (*f) (const char *, int, int); ++ ++int ++main () ++{ ++/* The GNU C library defines this for functions which it implements ++ to always fail with ENOSYS. Some functions are actually named ++ something starting with __ and the normal name is an alias. */ ++#if defined (__stub_gethostbyaddr) || defined (__stub___gethostbyaddr) ++choke me ++#else ++f = gethostbyaddr; ++#endif ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (eval echo "$as_me:8658: \"$ac_link\"") >&5 ++ (eval $ac_link) 2>&5 ++ ac_status=$? ++ echo "$as_me:8661: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (eval echo "$as_me:8664: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:8667: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_func_gethostbyaddr=yes ++else ++ echo "$as_me: failed program was:" >&5 ++cat conftest.$ac_ext >&5 ++ac_cv_func_gethostbyaddr=no ++fi ++rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++fi ++echo "$as_me:8677: result: $ac_cv_func_gethostbyaddr" >&5 ++echo "${ECHO_T}$ac_cv_func_gethostbyaddr" >&6 ++if test "$ac_cv_func_gethostbyaddr" = yes; then ++ cat >>confdefs.h <&5 ++echo $ECHO_N "checking for inet_addr... $ECHO_C" >&6 ++if test "${ac_cv_func_inet_addr+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++#line 8627 "configure" ++#include "confdefs.h" ++/* System header to define __stub macros and hopefully few prototypes, ++ which can conflict with char inet_addr (); below. */ ++#include ++/* Override any gcc2 internal prototype to avoid an error. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++/* We use char because int might match the return type of a gcc2 ++ builtin and then its argument prototype would still apply. */ ++#ifdef __MINGW32__ ++#define __STDCALL__ __attribute__((__stdcall__)) ++#else ++#define __STDCALL__ ++#endif ++__STDCALL__ char inet_addr (const char *); ++__STDCALL__ char (*f) (const char *); ++ ++int ++main () ++{ ++/* The GNU C library defines this for functions which it implements ++ to always fail with ENOSYS. Some functions are actually named ++ something starting with __ and the normal name is an alias. */ ++#if defined (__stub_inet_addr) || defined (__stub___inet_addr) ++choke me ++#else ++f = inet_addr; ++#endif ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (eval echo "$as_me:8658: \"$ac_link\"") >&5 ++ (eval $ac_link) 2>&5 ++ ac_status=$? ++ echo "$as_me:8661: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (eval echo "$as_me:8664: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:8667: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_func_inet_addr=yes ++else ++ echo "$as_me: failed program was:" >&5 ++cat conftest.$ac_ext >&5 ++ac_cv_func_inet_addr=no ++fi ++rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++fi ++echo "$as_me:8677: result: $ac_cv_func_inet_addr" >&5 ++echo "${ECHO_T}$ac_cv_func_inet_addr" >&6 ++if test "$ac_cv_func_inet_addr" = yes; then ++ cat >>confdefs.h <&5 ++echo $ECHO_N "checking for closesocket... $ECHO_C" >&6 ++if test "${ac_cv_func_closesocket+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++#line 8627 "configure" ++#include "confdefs.h" ++/* System header to define __stub macros and hopefully few prototypes, ++ which can conflict with char closesocket (); below. */ ++#include ++/* Override any gcc2 internal prototype to avoid an error. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++/* We use char because int might match the return type of a gcc2 ++ builtin and then its argument prototype would still apply. */ ++#ifdef __MINGW32__ ++#define __STDCALL__ __attribute__((__stdcall__)) ++#else ++#define __STDCALL__ ++#endif ++__STDCALL__ char closesocket (int); ++__STDCALL__ char (*f) (int); ++ ++int ++main () ++{ ++/* The GNU C library defines this for functions which it implements ++ to always fail with ENOSYS. Some functions are actually named ++ something starting with __ and the normal name is an alias. */ ++#if defined (__stub_closesocket) || defined (__stub___closesocket) ++choke me ++#else ++f = closesocket; ++#endif ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (eval echo "$as_me:8658: \"$ac_link\"") >&5 ++ (eval $ac_link) 2>&5 ++ ac_status=$? ++ echo "$as_me:8661: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (eval echo "$as_me:8664: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:8667: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_func_closesocket=yes ++else ++ echo "$as_me: failed program was:" >&5 ++cat conftest.$ac_ext >&5 ++ac_cv_func_closesocket=no ++fi ++rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++fi ++echo "$as_me:8677: result: $ac_cv_func_closesocket" >&5 ++echo "${ECHO_T}$ac_cv_func_closesocket" >&6 ++if test "$ac_cv_func_closesocket" = yes; then ++ cat >>confdefs.h < *) 0).getDescription((typelib_TypeDescription **) & g_pTypeDescription); + getCppuType((::com::sun::star::uno::Reference< XAccessible > *) 0).getDescription((typelib_TypeDescription **) & g_pTypeDescription); } if ( pJava_environment ) @@ -268,7 +268,7 @@ { if ( pWindow && pWindow->IsTopWindow() ) { - Reference< XAccessible > xAccessible; + ::com::sun::star::uno::Reference< XAccessible > xAccessible; // Test for combo box - drop down floating windows first Window * pParentWindow = pWindow->GetParent(); @@ -278,10 +278,10 @@ try { // The parent window of a combo box floating window should have the role COMBO_BOX - Reference< XAccessible > xParentAccessible(pParentWindow->GetAccessible()); + ::com::sun::star::uno::Reference< XAccessible > xParentAccessible(pParentWindow->GetAccessible()); if ( xParentAccessible.is() ) { - Reference< XAccessibleContext > xParentAC(xParentAccessible->getAccessibleContext()); + ::com::sun::star::uno::Reference< XAccessibleContext > xParentAC(xParentAccessible->getAccessibleContext()); if ( xParentAC.is() && (AccessibleRole::COMBO_BOX == xParentAC->getAccessibleRole()) ) { // O.k. - this is a combo box floating window corresponding to the child of role LIST of the parent. @@ -289,10 +289,10 @@ sal_Int32 nCount = xParentAC->getAccessibleChildCount(); for ( sal_Int32 n = 0; (n < nCount) && !xAccessible.is(); n++) { - Reference< XAccessible > xChild = xParentAC->getAccessibleChild(n); + ::com::sun::star::uno::Reference< XAccessible > xChild = xParentAC->getAccessibleChild(n); if ( xChild.is() ) { - Reference< XAccessibleContext > xChildAC = xChild->getAccessibleContext(); + ::com::sun::star::uno::Reference< XAccessibleContext > xChildAC = xChild->getAccessibleContext(); if ( xChildAC.is() && (AccessibleRole::LIST == xChildAC->getAccessibleRole()) ) { xAccessible = xChild; --- ./icu/icu-2.2.patch.orig 2003-08-15 20:32:16.000000000 +0900 +++ ./icu/icu-2.2.patch 2004-01-17 13:45:26.000000000 +0900 @@ -1,57 +1,3 @@ -*** misc/icu/source/configure Fri Aug 9 19:20:54 2002 ---- misc/build/icu/source/configure Tue Jul 22 10:11:48 2003 -*************** -*** 2325,2331 **** - else - U_HAVE_INTTYPES_H=1 - fi -! if test $CC = ccc; then - echo "$ac_t"""C compiler set to CCC ${CC}" " 1>&6 - case "${host}" in - alpha*-*-*) U_HAVE_INTTYPES_H=0; ---- 2325,2331 ---- - else - U_HAVE_INTTYPES_H=1 - fi -! if test "$CC" = ccc; then - echo "$ac_t"""C compiler set to CCC ${CC}" " 1>&6 - case "${host}" in - alpha*-*-*) U_HAVE_INTTYPES_H=0; -*** misc/icu/source/configure.in Fri Aug 9 19:20:56 2002 ---- misc/build/icu/source/configure.in Tue Jul 22 10:11:48 2003 -*************** -*** 288,294 **** - else - U_HAVE_INTTYPES_H=1 - fi -! if test $CC = ccc; then - AC_MSG_RESULT("C compiler set to CCC ${CC}" ) - case "${host}" in - alpha*-*-*) U_HAVE_INTTYPES_H=0; ---- 288,294 ---- - else - U_HAVE_INTTYPES_H=1 - fi -! if test "$CC" = ccc; then - AC_MSG_RESULT("C compiler set to CCC ${CC}" ) - case "${host}" in - alpha*-*-*) U_HAVE_INTTYPES_H=0; -*** misc/icu/source/icudefs.mk.in Wed Jul 31 22:28:32 2002 ---- misc/build/icu/source/icudefs.mk.in Tue Jul 22 10:11:49 2003 -*************** -*** 133,139 **** ---- 133,143 ---- - SHLIB.cc= $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared - - # Environment variable to set a runtime search path -+ ifeq ($(OS), IRIX) -+ LDLIBRARYPATH_ENVVAR = LD_LIBRARYN32_PATH -+ else - LDLIBRARYPATH_ENVVAR = LD_LIBRARY_PATH -+ endif - - # Versioned target for a shared library. - FINAL_SO_TARGET = $(SO_TARGET).$(SO_TARGET_VERSION) *** misc/icu/source/common/brkiter.cpp Thu Aug 8 02:39:14 2002 --- misc/build/icu/source/common/brkiter.cpp Tue Jul 22 10:11:48 2003 *************** @@ -256,25 +202,6 @@ ## Compiler switch to embed a library name LD_SONAME = -h $(MIDDLE_SO_TARGET) -*** misc/icu/source/data/Makefile.in Thu Aug 15 19:08:02 2002 ---- misc/build/icu/source/data/Makefile.in Tue Jul 22 10:11:49 2003 -*************** -*** 127,133 **** - - ## BRK files - # ALL of these files can be deleted (the following BRK files) - they are copied -! BRK_FILES_SHORT=char.brk line.brk line_th.brk sent.brk word.brk title.brk word_th.brk - BRK_FILES=$(BRK_FILES_SHORT:%=$(BUILDDIR)/$(ICUDT)%) - # don't include thaidict.brk - it goes into a resource bundle - plus it isn't deleted - ---- 127,133 ---- - - ## BRK files - # ALL of these files can be deleted (the following BRK files) - they are copied -! BRK_FILES_SHORT=char.brk line.brk line_th.brk sent.brk word.brk edit_word.brk dict_word.brk count_word.brk title.brk word_th.brk - BRK_FILES=$(BRK_FILES_SHORT:%=$(BUILDDIR)/$(ICUDT)%) - # don't include thaidict.brk - it goes into a resource bundle - plus it isn't deleted - *** misc/icu/source/data/makedata.mak Fri Aug 9 22:55:36 2002 --- misc/build/icu/source/data/makedata.mak Tue Jul 22 10:13:07 2003 *************** @@ -1054,25 +981,6 @@ { const ScriptListTable *scriptListTable = NULL; const LangSysTable *langSysTable = NULL; -*** misc/icu/source/layout/Makefile.in Sat Jul 20 01:24:32 2002 ---- misc/build/icu/source/layout/Makefile.in Tue Jul 22 10:11:49 2003 -*************** -*** 38,44 **** - - CPPFLAGS += -I$(srcdir) -I$(top_builddir)/common -I$(srcdir)/unicode -I$(srcdir)/.. -I$(top_builddir)/common -I$(top_srcdir)/common $(LIBCPPFLAGS) - DEFS += -DU_LAYOUT_IMPLEMENTATION -! LIBS = $(DEFAULT_LIBS) - - - OBJECTS = loengine.o \ ---- 38,44 ---- - - CPPFLAGS += -I$(srcdir) -I$(top_builddir)/common -I$(srcdir)/unicode -I$(srcdir)/.. -I$(top_builddir)/common -I$(top_srcdir)/common $(LIBCPPFLAGS) - DEFS += -DU_LAYOUT_IMPLEMENTATION -! LIBS = $(LIBICUUC) $(DEFAULT_LIBS) - - - OBJECTS = loengine.o \ *** misc/icu/source/layout/OpenTypeLayoutEngine.h Wed Aug 14 02:17:50 2002 --- misc/build/icu/source/layout/OpenTypeLayoutEngine.h Tue Jul 22 10:11:49 2003 *************** @@ -1107,3 +1015,523 @@ return tempGlyphCount; }; +--- misc/build/icu/source/extra/uconv/uconv.dsp.orig 2003-07-27 22:46:30.000000000 +0900 ++++ misc/build/icu/source/extra/uconv/uconv.dsp 2003-07-28 22:13:58.000000000 +0900 +@@ -219,7 +219,7 @@ + InputName=makedata + + "Release/uconvmsg.lib" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" +- nmake /nologo /f $(InputName).mak icup=$(ProjDir)\..\..\.. CFG=Release ++ nmake /nologo /f $(InputName).mak icup="$(ProjDir)\..\..\.." CFG=Release + + # End Custom Build + +@@ -231,7 +231,7 @@ + InputName=makedata + + "Debug/uconvmsg.lib" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" +- nmake /nologo /f $(InputName).mak icup=$(ProjDir)\..\..\.. CFG=Debug ++ nmake /nologo /f $(InputName).mak icup="$(ProjDir)\..\..\.." CFG=Debug + + # End Custom Build + +@@ -243,7 +243,7 @@ + InputName=makedata + + "Release/uconvmsg.lib" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" +- nmake /nologo /f $(InputName).mak icup=$(ProjDir)\..\..\.. CFG=Release ++ nmake /nologo /f $(InputName).mak icup="$(ProjDir)\..\..\.." CFG=Release + + # End Custom Build + +@@ -255,7 +255,7 @@ + InputName=makedata + + "Debug/uconvmsg.lib" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" +- nmake /nologo /f $(InputName).mak icup=$(ProjDir)\..\..\.. CFG=Debug ++ nmake /nologo /f $(InputName).mak icup="$(ProjDir)\..\..\.." CFG=Debug + + # End Custom Build + +--- misc/build/icu/source/common/unicode/umachine.h.orig 2001-12-08 02:09:42.000000000 +0900 ++++ misc/build/icu/source/common/unicode/umachine.h 2003-10-11 13:40:02.000000000 +0900 +@@ -41,7 +41,9 @@ + /* which are contained in the platform-specific file platform.h */ + /*==========================================================================*/ + +-#if defined(WIN32) || defined(_WIN32) || defined(WIN64) || defined(_WIN64) ++#if defined(__MINGW32__) ++# include "unicode/platform.h" ++#elif defined(WIN32) || defined(_WIN32) || defined(WIN64) || defined(_WIN64) + # include "unicode/pwin32.h" + #elif defined(__OS2__) + # include "unicode/pos2.h" +--- misc/build/icu/source/common/unicode/platform.h.in.orig 2002-07-31 05:54:42.000000000 +0900 ++++ misc/build/icu/source/common/unicode/platform.h.in 2003-10-11 20:33:00.000000000 +0900 +@@ -235,14 +235,18 @@ + /* Symbol import-export control */ + /*===========================================================================*/ + +-#define U_EXPORT ++/* cygwin needs to export/import data */ ++#ifdef U_CYGWIN ++#define U_EXPORT __declspec(dllexport) + /* U_CALLCONV is releated to U_EXPORT2 */ + #define U_EXPORT2 + +-/* cygwin needs to export/import data */ +-#ifdef U_CYGWIN + #define U_IMPORT __declspec(dllimport) + #else ++#define U_EXPORT ++/* U_CALLCONV is releated to U_EXPORT2 */ ++#define U_EXPORT2 ++ + #define U_IMPORT + #endif + +--- misc/build/icu/source/common/hash.h.orig 2002-07-12 09:23:48.000000000 +0900 ++++ misc/build/icu/source/common/hash.h 2003-10-12 10:42:36.000000000 +0900 +@@ -46,7 +46,12 @@ + * Non-virtual destructor; make this virtual if Hashtable is subclassed + * in the future. + */ +- ~Hashtable(); ++ inline ~Hashtable() { ++ if (hash != 0) { ++ uhash_close(hash); ++ hash = 0; ++ } ++ } + + UObjectDeleter *setValueDeleter(UObjectDeleter *fn); + +@@ -124,12 +129,14 @@ + } + } + ++#if 0 + inline Hashtable::~Hashtable() { + if (hash != 0) { + uhash_close(hash); + hash = 0; + } + } ++#endif + + inline UObjectDeleter *Hashtable::setValueDeleter(UObjectDeleter *fn) { + return uhash_setValueDeleter(hash, fn); +--- misc/build/icu/source/common/unicode/unifunct.h.orig 2002-08-09 09:07:16.000000000 +0900 ++++ misc/build/icu/source/common/unicode/unifunct.h 2003-10-12 10:45:12.000000000 +0900 +@@ -31,7 +31,7 @@ + /** + * Destructor + */ +- virtual ~UnicodeFunctor(); ++ virtual inline ~UnicodeFunctor() {} + + /** + * Return a copy of this object. All UnicodeFunctor objects +@@ -123,7 +123,7 @@ + }; + + inline UnicodeFunctor::UnicodeFunctor() {} +-inline UnicodeFunctor::~UnicodeFunctor() {} ++// inline UnicodeFunctor::~UnicodeFunctor() {} + + U_NAMESPACE_END + +--- misc/build/icu/source/common/unicode/unifilt.h.orig 2002-06-29 09:01:30.000000000 +0900 ++++ misc/build/icu/source/common/unicode/unifilt.h 2003-10-12 10:44:54.000000000 +0900 +@@ -54,7 +54,7 @@ + * Destructor + * @stable + */ +- virtual ~UnicodeFilter(); ++ virtual inline ~UnicodeFilter() {} + + /** + * Returns true for characters that are in the selected +@@ -130,7 +130,7 @@ + }; + + inline UnicodeFilter::UnicodeFilter() {} +-inline UnicodeFilter::~UnicodeFilter() {} ++//inline UnicodeFilter::~UnicodeFilter() {} + + U_NAMESPACE_END + +--- misc/build/icu/source/common/unicode/putil.h.orig 2002-07-03 21:05:04.000000000 +0900 ++++ misc/build/icu/source/common/unicode/putil.h 2003-10-12 17:36:56.000000000 +0900 +@@ -237,7 +237,7 @@ + # define U_PATH_SEP_CHAR ';' + # define U_FILE_SEP_STRING ":" + # define U_PATH_SEP_STRING ";" +-#elif defined(WIN32) || defined(OS2) ++#elif (defined(WIN32) || defined(OS2)) && (!defined(U_CYGWIN)) + # define U_FILE_SEP_CHAR '\\' + # define U_PATH_SEP_CHAR ';' + # define U_FILE_SEP_STRING "\\" +--- misc/build/icu/source/tools/pkgdata/pkgdata.c.orig 2002-08-01 05:28:28.000000000 +0900 ++++ misc/build/icu/source/tools/pkgdata/pkgdata.c 2003-10-12 19:26:56.000000000 +0900 +@@ -51,17 +51,17 @@ + } modes[] = + { + { "files", 0, pkg_mode_files, "Uses raw data files (no effect). Installation copies all files to the target location." }, +-#ifdef WIN32 ++#if defined(WIN32) && ! defined(U_CYGWIN) + { "dll", "library", pkg_mode_windows, "Generates one common data file and one shared library, .dll"}, + { "common", "archive", pkg_mode_windows, "Generates just the common file, .dat"}, + { "static", "static", pkg_mode_windows, "Generates one statically linked library, " LIB_PREFIX "" UDATA_LIB_SUFFIX } +-#else /*#ifdef WIN32*/ ++#else /*#if defined(WIN32) && ! defined(U_CYGWIN)*/ + #ifdef UDATA_SO_SUFFIX + { "dll", "library", pkg_mode_dll, "Generates one shared library, " UDATA_SO_SUFFIX }, + #endif + { "common", "archive", pkg_mode_common, "Generates one common data file, .dat" }, + { "static", "static", pkg_mode_static, "Generates one statically linked library, " LIB_PREFIX "" UDATA_LIB_SUFFIX } +-#endif /*#ifdef WIN32*/ ++#endif /*#if defined(WIN32) && ! defined(U_CYGWIN)*/ + }; + + static UOption options[]={ +@@ -88,7 +88,7 @@ + + const char options_help[][160]={ + "Set the data name", +-#ifdef WIN32 ++#if defined(WIN32) && ! defined(U_CYGWIN) + "R:icupath for release version or D:icupath for debug version, where icupath is the directory where ICU is located", + #else + "Specify options for the builder. (Autdetected if icu-config is available)", +@@ -251,7 +251,7 @@ + o.cShortName = csname; + } + +-#ifdef WIN32 /* format is R:pathtoICU or D:pathtoICU */ ++#if defined(WIN32) && ! defined(U_CYGWIN) /* format is R:pathtoICU or D:pathtoICU */ + { + char *pathstuff = (char *)options[1].value; + if(options[1].value[uprv_strlen(options[1].value)-1] == '\\') { +@@ -387,7 +387,7 @@ + } + + /*getcwd(pwd, 1024);*/ +-#ifdef WIN32 ++#if defined(WIN32) && ! defined(U_CYGWIN) + sprintf(cmd, "%s %s%s -f \"%s\" %s %s %s %s", + make, + o->install ? "INSTALLTO=" : "", +--- misc/build/icu/source/tools/pkgdata/makefile.h.orig 2002-08-07 04:06:32.000000000 +0900 ++++ misc/build/icu/source/tools/pkgdata/makefile.h 2003-10-12 19:52:08.000000000 +0900 +@@ -41,9 +41,9 @@ + + + +-#ifdef WIN32 ++#if defined(WIN32) && ! defined(U_CYGWIN) + extern void pkg_mode_windows(UPKGOptions *o, FileStream *makefile, UErrorCode *status); +-#else /*#ifdef WIN32*/ ++#else /*#if defined(WIN32) && ! defined(U_CYGWIN)*/ + /** + * Write stanzas for generating .o (and .c) files for each data file in 'o->filePaths'. + * @param o Package options struct +@@ -58,7 +58,7 @@ + extern void pkg_mode_static(UPKGOptions* o, FileStream *stream, UErrorCode *status); + #endif /*#ifdef UDATA_SO_SUFFIX*/ + extern void pkg_mode_common(UPKGOptions* o, FileStream *stream, UErrorCode *status); +-#endif /*#ifdef WIN32*/ ++#endif /*#if defined(WIN32) && ! defined(U_CYGWIN)*/ + + extern void pkg_mode_files(UPKGOptions* o, FileStream *stream, UErrorCode *status); + +--- misc/build/icu/source/tools/pkgdata/pkgtypes.h.orig 2002-04-02 11:50:30.000000000 +0900 ++++ misc/build/icu/source/tools/pkgdata/pkgtypes.h 2003-10-12 19:52:04.000000000 +0900 +@@ -126,7 +126,7 @@ + + /* set up common defines for library naming */ + +-#ifdef WIN32 ++#if defined(WIN32) && ! defined(U_CYGWIN) + # ifndef UDATA_SO_SUFFIX + # define UDATA_SO_SUFFIX ".DLL" + # endif +--- misc/build/icu/source/tools/pkgdata/sttcmode.c.orig 2002-08-07 04:06:32.000000000 +0900 ++++ misc/build/icu/source/tools/pkgdata/sttcmode.c 2003-10-12 20:57:40.000000000 +0900 +@@ -104,7 +104,7 @@ + } + + +-#ifndef WIN32 ++#if !defined(WIN32) || defined(U_CYGWIN) + + + #include "makefile.h" +--- misc/build/icu/source/extra/uconv/Makefile.in.orig 2002-08-01 05:28:30.000000000 +0900 ++++ misc/build/icu/source/extra/uconv/Makefile.in 2003-10-12 21:56:08.000000000 +0900 +@@ -133,7 +133,7 @@ + @$(MKINSTALLDIRS) $(RESDIR) + @-$(RMV) $@ + @for file in $(RESFILES); do \ +- echo `pwd`/$$file >> $@; \ ++ echo $$file >> $@; \ + done; + + # no install for static mode +--- misc/build/icu/source/common/Makefile.in.orig 2002-08-13 05:30:14.000000000 +0900 ++++ misc/build/icu/source/common/Makefile.in 2003-10-12 23:03:30.000000000 +0900 +@@ -142,7 +142,7 @@ + + ifneq ($(ENABLE_SHARED),) + $(FINAL_SO_TARGET): $(OBJECTS) +- $(SHLIB.cc) $(LD_SONAME) -o $@ $^ $(LIBS) ++ $(SHLIB.cc) $(LD_SONAME) $(LD_IMPLIB) -o $@ $^ $(LIBS) + + ifeq ($(OS390BATCH),1) + $(BATCH_TARGET): $(OBJECTS) +--- misc/build/icu/source/extra/ustdio/Makefile.in.orig 2002-08-14 09:38:40.000000000 +0900 ++++ misc/build/icu/source/extra/ustdio/Makefile.in 2003-10-12 23:03:06.000000000 +0900 +@@ -121,7 +121,7 @@ + + ifneq ($(ENABLE_SHARED),) + $(FINAL_SO_TARGET): $(OBJECTS) +- $(SHLIB.cc) $(LD_SONAME) -o $@ $^ $(LIBS) ++ $(SHLIB.cc) $(LD_SONAME) $(LD_IMPLIB) -o $@ $^ $(LIBS) + + ifeq ($(OS390BATCH),1) + $(BATCH_TARGET): $(OBJECTS) +--- misc/build/icu/source/i18n/Makefile.in.orig 2002-08-14 09:38:40.000000000 +0900 ++++ misc/build/icu/source/i18n/Makefile.in 2003-10-12 23:01:26.000000000 +0900 +@@ -134,7 +134,7 @@ + + ifneq ($(ENABLE_SHARED),) + $(FINAL_SO_TARGET): $(OBJECTS) +- $(SHLIB.cc) $(LD_SONAME) -o $@ $^ $(LIBS) ++ $(SHLIB.cc) $(LD_SONAME) $(LD_IMPLIB) -o $@ $^ $(LIBS) + + ifeq ($(OS390BATCH),1) + $(BATCH_TARGET):$(OBJECTS) +--- misc/build/icu/source/layout/Makefile.in.orig 2002-07-20 08:24:32.000000000 +0900 ++++ misc/build/icu/source/layout/Makefile.in 2003-10-12 23:00:32.000000000 +0900 +@@ -38,7 +38,7 @@ + + CPPFLAGS += -I$(srcdir) -I$(top_builddir)/common -I$(srcdir)/unicode -I$(srcdir)/.. -I$(top_builddir)/common -I$(top_srcdir)/common $(LIBCPPFLAGS) + DEFS += -DU_LAYOUT_IMPLEMENTATION +-LIBS = $(DEFAULT_LIBS) ++LIBS = $(LIBICUUC) $(DEFAULT_LIBS) + + + OBJECTS = loengine.o \ +@@ -176,7 +176,7 @@ + + ifneq ($(ENABLE_SHARED),) + $(FINAL_SO_TARGET): $(OBJECTS) +- $(SHLIB.cc) $(LD_SONAME) -o $@ $^ $(LIBS) ++ $(SHLIB.cc) $(LD_SONAME) $(LD_IMPLIB) -o $@ $^ $(LIBS) + endif + + ifeq (,$(MAKECMDGOALS)) +--- misc/build/icu/source/tools/ctestfw/Makefile.in.orig 2002-07-20 06:45:32.000000000 +0900 ++++ misc/build/icu/source/tools/ctestfw/Makefile.in 2003-10-12 22:58:30.000000000 +0900 +@@ -100,7 +100,7 @@ + + ifneq ($(ENABLE_SHARED),) + $(FINAL_SO_TARGET): $(OBJECTS) +- $(SHLIB.cc) $(LD_SONAME) -o $@ $^ $(LIBS) ++ $(SHLIB.cc) $(LD_SONAME) $(LD_IMPLIB) -o $@ $^ $(LIBS) + endif + + ifeq (,$(MAKECMDGOALS)) +--- misc/build/icu/source/tools/toolutil/Makefile.in.orig 2002-05-14 08:50:12.000000000 +0900 ++++ misc/build/icu/source/tools/toolutil/Makefile.in 2003-10-12 22:57:56.000000000 +0900 +@@ -98,7 +98,7 @@ + + ifneq ($(ENABLE_SHARED),) + $(FINAL_SO_TARGET): $(OBJECTS) +- $(SHLIB.cc) $(LD_SONAME) -o $@ $^ $(LIBS) ++ $(SHLIB.cc) $(LD_SONAME) $(LD_IMPLIB) -o $@ $^ $(LIBS) + endif + + ifeq (,$(MAKECMDGOALS)) +--- misc/build/icu/source/configure.orig 2002-08-10 02:20:54.000000000 +0900 ++++ misc/build/icu/source/configure 2003-10-13 00:30:14.000000000 +0900 +@@ -1989,7 +1989,7 @@ + else + ac_func_search_save_LIBS="$LIBS" + ac_cv_search_pthread_mutex_destroy="no" +-for i in pthread pthreads c_r cma; do ++for i in pthread pthreads c_r cma pthreadGCE; do + LIBS="-l$i $ac_func_search_save_LIBS" + cat > conftest.$ac_ext <&6 + case "${host}" in + alpha*-*-*) U_HAVE_INTTYPES_H=0; +@@ -2966,8 +2966,12 @@ + #endif + #include + #ifndef tzname /* For SGI. */ ++#ifdef __MINGW_IMPORT ++__MINGW_IMPORT char *tzname[]; /* RS6000 and others reject char **tzname. */ ++#else + extern char *tzname[]; /* RS6000 and others reject char **tzname. */ + #endif ++#endif + int main() { + atoi(*tzname); + ; return 0; } +@@ -2997,7 +3001,11 @@ + #line 2998 "configure" + #include "confdefs.h" + #include ++#ifdef __MINGW_IMPORT ++ __MINGW_IMPORT char *_tzname[]; ++#else + extern char *_tzname[]; ++#endif + + int main() { + atoi(*_tzname); +--- misc/build/icu/source/stubdata/Makefile.in.orig 2002-05-22 07:41:42.000000000 +0900 ++++ misc/build/icu/source/stubdata/Makefile.in 2004-01-17 11:55:50.000000000 +0900 +@@ -25,11 +25,11 @@ + ## Target information + + ifneq ($(ENABLE_STATIC),) +-TARGET = lib$(ICUPREFIX)data$(ICULIBSUFFIX).a ++TARGET = $(LIBICU)data$(ICULIBSUFFIX).a + endif + + ifneq ($(ENABLE_SHARED),) +-SO_TARGET = lib$(ICUPREFIX)data$(ICULIBSUFFIX)$(STUB_SUFFIX).$(SO) ++SO_TARGET = $(LIBICU)data$(ICULIBSUFFIX)$(STUB_SUFFIX).$(SO) + ALL_SO_TARGETS = $(SO_TARGET) $(MIDDLE_SO_TARGET) $(FINAL_SO_TARGET) $(BATCH_STUB_TARGET) + endif + +@@ -110,7 +110,7 @@ + + ifneq ($(ENABLE_SHARED),) + $(FINAL_SO_TARGET): $(OBJECTS) +- $(SHLIB.c) $(LD_SONAME) -o $@ $^ $(LIBS) ++ $(SHLIB.c) $(LD_SONAME) $(LD_IMPLIB) -o $@ $^ $(LIBS) + + ifeq ($(OS390BATCH),1) + $(BATCH_STUB_TARGET): $(OBJECTS) +--- misc/build/icu/source/data/Makefile.in.orig 2002-08-16 02:08:02.000000000 +0900 ++++ misc/build/icu/source/data/Makefile.in 2004-01-17 13:34:20.000000000 +0900 +@@ -17,13 +17,13 @@ + subdir = data + + #lib icu data for link +-LIB_ICUDATA_NAME=lib$(ICUDATA_NAME) ++LIB_ICUDATA_NAME=$(LIBPREFIX)$(ICUDATA_NAME) + + # sanity! + ICUDT=$(ICUDATA_PLATFORM_NAME)_ + + top_builddir_from_tmp = $(patsubst ..%,../..%,$(top_builddir)) +-CURDIR=$(shell pwd) ++CURDIR=. + PKGDATA = $(top_builddir)/tools/pkgdata/pkgdata -O $(top_builddir)/data/icupkg.inc -d $(CURDIR)/out + PKGDATA_VERSIONING = -r $(SO_TARGET_VERSION) + +@@ -127,7 +127,7 @@ + + ## BRK files + # ALL of these files can be deleted (the following BRK files) - they are copied +-BRK_FILES_SHORT=char.brk line.brk line_th.brk sent.brk word.brk title.brk word_th.brk ++BRK_FILES_SHORT=char.brk line.brk line_th.brk sent.brk word.brk edit_word.brk dict_word.brk count_word.brk title.brk word_th.brk + BRK_FILES=$(BRK_FILES_SHORT:%=$(BUILDDIR)/$(ICUDT)%) + # don't include thaidict.brk - it goes into a resource bundle - plus it isn't deleted + +--- misc/build/icu/source/config/mh-cygwin.orig 2002-03-20 03:13:48.000000000 +0900 ++++ misc/build/icu/source/config/mh-cygwin 2004-01-17 13:34:10.000000000 +0900 +@@ -26,8 +26,19 @@ + LD_RPATH= + LD_RPATH_PRE= -Wl,-rpath, + ++## Versioned target for a shared library. ++FINAL_SO_TARGET = $(SO_TARGET:.dll=).$(SO_TARGET_VERSION_MAJOR).$(SO) ++MIDDLE_SO_TARGET = $(SO_TARGET:.dll=).$(SO_TARGET_VERSION_MAJOR).$(SO) ++ ++### How ICU libraries are named... ex. $(LIBICU)uc$(SO) ++## Prefix for the ICU library names ++LIBPREFIX = ++LIBICU = $(ICUPREFIX) ++ + ## Compiler switch to embed a library name +-LD_SONAME = -Wl,-soname -Wl,$(MIDDLE_SO_TARGET) ++LD_SONAME = -Wl,-E,--export-all-symbols,-Bdynamic,-soname,$(MIDDLE_SO_TARGET) ++IMPLIB_TARGET = lib$(SO_TARGET:.dll=.a) ++LD_IMPLIB = -Wl,--out-implib,$(IMPLIB_TARGET) + + ## Shared object suffix + SO = dll +@@ -63,10 +74,8 @@ + + ## Versioned libraries rules + +-%.$(SO).$(SO_TARGET_VERSION_MAJOR): %.$(SO).$(SO_TARGET_VERSION) +- $(RM) $@ && cp $< $@ +-%.$(SO): %.$(SO).$(SO_TARGET_VERSION_MAJOR) +- $(RM) $@ && cp $*.$(SO).$(SO_TARGET_VERSION) $@ ++%.$(SO): %.$(SO_TARGET_VERSION_MAJOR).$(SO) ++ $(RM) $@ && cp $*.$(SO_TARGET_VERSION_MAJOR).$(SO) $@ + + ## Bind internal references + +--- misc/build/icu/source/icudefs.mk.in.orig 2002-08-01 05:28:32.000000000 +0900 ++++ misc/build/icu/source/icudefs.mk.in 2004-01-17 13:20:12.000000000 +0900 +@@ -133,7 +133,11 @@ + SHLIB.cc= $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared + + # Environment variable to set a runtime search path ++ifeq ($(OS), IRIX) ++LDLIBRARYPATH_ENVVAR = LD_LIBRARYN32_PATH ++else + LDLIBRARYPATH_ENVVAR = LD_LIBRARY_PATH ++endif + + # Versioned target for a shared library. + FINAL_SO_TARGET = $(SO_TARGET).$(SO_TARGET_VERSION) +@@ -142,7 +146,8 @@ + ## How ICU libraries are named... ex. $(LIBICU)uc$(SO) + # Prefix for the ICU library names + ICUPREFIX = icu +-LIBICU = lib$(ICUPREFIX) ++LIBPREFIX = lib ++LIBICU = $(LIBPREFIX)$(ICUPREFIX) + + # Force removal [for make clean] + RMV = rm -rf +--- misc/build/icu/source/tools/pkgdata/dllmode.c.orig 2002-08-07 04:06:30.000000000 +0900 ++++ misc/build/icu/source/tools/pkgdata/dllmode.c 2004-01-17 13:38:36.000000000 +0900 +@@ -39,7 +39,7 @@ + return; + } + +- uprv_strcpy(tmp, LIB_PREFIX "$(NAME)" UDATA_SO_SUFFIX); ++ uprv_strcpy(tmp, "$(LIBPREFIX)$(NAME)" UDATA_SO_SUFFIX); + + /* We should be the only item. So we don't care about the order. */ + o->outFiles = pkg_appendToList(o->outFiles, &tail, uprv_strdup(tmp)); +@@ -175,8 +175,11 @@ + "# \t-ls -l $@\n\n"); + #endif + +- T_FileStream_writeLine(makefile, "$(TARGETDIR)/$(FINAL_SO_TARGET): $(OBJECTS) $(LISTFILES) $(DLL_DEPS)\n" +- "\t$(SHLIB.c) -o $@ $(OBJECTS) $(DLL_LDFLAGS)\n" ++ T_FileStream_writeLine(makefile, "ifneq ($(IMPLIB_TARGET),)\n" ++ "IMPLIB_LDFLAGS = -Wl,--out-implib,$(TARGETDIR)/$(IMPLIB_TARGET)\n" ++ "endif\n\n" ++ "$(TARGETDIR)/$(FINAL_SO_TARGET): $(OBJECTS) $(LISTFILES) $(DLL_DEPS)\n" ++ "\t$(SHLIB.c) -o $@ $(OBJECTS) $(DLL_LDFLAGS) $(IMPLIB_LDFLAGS)\n" + "\t-ls -l $@\n\n"); + #endif + --- ./zlib/prj/d.lst.orig 2002-08-26 19:00:28.000000000 +0900 +++ ./zlib/prj/d.lst 2003-12-31 09:31:08.000000000 +0900 @@ -5,6 +5,7 @@ ..\%__SRC%\inc\zconf.h %_DEST%\inc%_EXT%\external\zconf.h ..\%__SRC%\lib\libzlib.a %_DEST%\lib%_EXT%\libzlib.a +..\%__SRC%\lib\libzlib_static.a %_DEST%\lib%_EXT%\libzlib_static.a ..\%__SRC%\slb\zlib.lib %_DEST%\lib%_EXT%\zlib.lib ..\%__SRC%\slb\zlib.lin %_DEST%\lib%_EXT%\zlib.lin --- ./cosv/source/comphelp/badcast.cxx.orig 2002-05-14 17:08:46.000000000 +0900 +++ ./cosv/source/comphelp/badcast.cxx 2003-11-01 11:45:14.000000000 +0900 @@ -65,7 +65,7 @@ due to problems with WNT-STL-headers. */ -#ifdef WNT +#if defined(WNT) && !defined(__MINGW32__) #define _NTSDK #include --- ./expat/prj/d.lst.orig 2002-09-30 14:27:06.000000000 +0900 +++ ./expat/prj/d.lst 2004-01-04 00:35:46.000000000 +0900 @@ -6,4 +6,7 @@ ..\%__SRC%\lib\libexpat_xmltok.a %_DEST%\lib%_EXT%\libexpat_xmltok.a ..\%__SRC%\lib\libexpat_xmlparse.a %_DEST%\lib%_EXT%\libexpat_xmlparse.a ..\%__SRC%\lib\libascii_expat_xmlparse.a %_DEST%\lib%_EXT%\libascii_expat_xmlparse.a +..\%__SRC%\lib\libexpat_xmltok_static.a %_DEST%\lib%_EXT%\libexpat_xmltok_static.a +..\%__SRC%\lib\libexpat_xmlparse_static.a %_DEST%\lib%_EXT%\libexpat_xmlparse_static.a +..\%__SRC%\lib\libascii_expat_xmlparse_static.a %_DEST%\lib%_EXT%\libascii_expat_xmlparse_static.a --- ./filter/prj/d.lst.orig 2003-07-17 03:01:16.000000000 +0900 +++ ./filter/prj/d.lst 2004-01-13 22:24:40.000000000 +0900 @@ -1,5 +1,6 @@ ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll ..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT% +..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT% ..\%__SRC%\lib\lib*.dylib %_DEST%\lib%_EXT% ..\%__SRC%\class\*.jar %_DEST%\bin%_EXT%\*.jar ..\%__SRC%\class\XSLTFilter\*.jar %_DEST%\bin%_EXT%\*.jar --- ./neon/prj/d.lst.orig 2002-01-23 22:33:44.000000000 +0900 +++ ./neon/prj/d.lst 2004-01-04 00:32:28.000000000 +0900 @@ -3,3 +3,4 @@ ..\%__SRC%\inc\*.h %_DEST%\inc%_EXT%\external\neon\*.h ..\%__SRC%\slb\neon.lib %_DEST%\lib%_EXT%\neon.lib ..\%__SRC%\lib\libneon.a %_DEST%\lib%_EXT%\libneon.a +..\%__SRC%\lib\libneon_static.a %_DEST%\lib%_EXT%\libneon_static.a --- ./neon/neon.patch.orig 2002-10-24 20:50:58.000000000 +0900 +++ ./neon/neon.patch 2004-01-04 01:43:40.000000000 +0900 @@ -3,7 +3,7 @@ *************** *** 1 **** ! dummy ---- 1,130 ---- +--- 1,132 ---- ! ! /* Define to be the neon version string */ ! #define NEON_VERSION "0.23.5" @@ -126,9 +126,11 @@ ! #define vsnprintf _vsnprintf ! #define strcasecmp strcmpi ! #define strncasecmp strnicmp -! #define ssize_t int ! #define inline __inline +! #ifndef __MINGW32__ +! #define ssize_t int ! #define off_t _off_t +! #endif ! ! #include ! #define read _read @@ -203,3 +205,14 @@ /* If we get a non-2xx response back here, we wipe the value for * each of the properties in this propstat, so the caller knows to * look at the status instead. It's annoying, since for each prop +--- misc/build/neon-0.23.5/src/ne_utils.h.orig 2002-08-18 21:48:48.000000000 +0900 ++++ misc/build/neon-0.23.5/src/ne_utils.h 2004-01-04 01:40:58.000000000 +0900 +@@ -58,7 +58,7 @@ + #define ne_vsnprintf vsnprintf + #endif + +-#ifndef WIN32 ++#if !defined(WIN32) || defined(__MINGW32__) + #undef min + #define min(a,b) ((a)<(b)?(a):(b)) + #endif --- ./stlport/STLport-4.5.patch.orig 2003-08-15 22:51:44.000000000 +0900 +++ ./stlport/STLport-4.5.patch 2004-01-11 15:39:52.000000000 +0900 @@ -200,73 +200,6 @@ CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC -*** misc/STLport-4.5/stlport/config/stl_gcc.h Tue Sep 4 12:10:16 2001 ---- misc/build/STLport-4.5/stlport/config/stl_gcc.h Tue Jul 29 21:53:36 2003 -*************** -*** 75,80 **** ---- 75,82 ---- - - # define __unix - -+ # if ( __GNUC__ < 3 ) -+ - /* Mac OS X needs one and only one source file to initialize all static data - * members in template classes. Only one source file in an executable or - * library can declare instances for such data members, otherwise duplicate -*************** -*** 97,103 **** - # define _STLP_NATIVE_CPP_C_HEADER(header) <../g++/##header##> - # define _STLP_NATIVE_OLD_STREAMS_HEADER(header) <../g++/##header##> - # define _STLP_NATIVE_CPP_RUNTIME_HEADER(header) <../g++/##header##> -! # endif - - - # if defined(__BEOS__) && defined(__INTEL__) ---- 99,121 ---- - # define _STLP_NATIVE_CPP_C_HEADER(header) <../g++/##header##> - # define _STLP_NATIVE_OLD_STREAMS_HEADER(header) <../g++/##header##> - # define _STLP_NATIVE_CPP_RUNTIME_HEADER(header) <../g++/##header##> -! -! # else -! /* Mac OS X using gcc 3.3 handles all well */ -! # undef _STLP_NO_STATIC_TEMPLATE_DATA -! # define _STLP_STATIC_TEMPLATE_DATA 1 -! # define _STLP_WEAK_ATTRIBUTE 1 -! # undef _STLP_NO_LONG_DOUBLE -! -! #if 0 -! /* Mac OS X needs all "::" scope references to be "std::" */ -! # define _STLP_NO_CSTD_FUNCTION_IMPORTS -! # undef _STLP_VENDOR_GLOBAL_STD -! # undef _STLP_VENDOR_GLOBAL_CSTD -! #endif -! -! # endif /* __GNUC__ < 3 */ -! # endif /* __APPLE__ */ - - - # if defined(__BEOS__) && defined(__INTEL__) -*************** -*** 226,233 **** - - # if (__GNUC__ >= 3) - -! # define _STLP_NATIVE_INCLUDE_PATH ../g++-v3 -! # define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++-v3/backward - - # elif (__GNUC_MINOR__ < 8) - ---- 244,253 ---- - - # if (__GNUC__ >= 3) - -! /* properly determine the STLP_NATIVE_INCLUDE_PATH */ -! # define _STLP_NATIVE_INCLUDE_PATH GXX_INCLUDE_PATH -! # define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH \ -! GXX_INCLUDE_PATH/backward - - # elif (__GNUC_MINOR__ < 8) - *** misc/STLport-4.5/stlport/cwchar Fri Jan 26 19:39:42 2001 --- misc/build/STLport-4.5/stlport/cwchar Tue Jul 29 21:53:36 2003 *************** @@ -385,3 +318,181 @@ ! # $(CXX) $(CXXFLAGS) -O4 -S -pto $< -o $@ ! ! +--- misc/build/STLport-4.5/src/gcc-3.0-mingw.mak.orig 2003-12-14 22:00:00.000000000 +0900 ++++ misc/build/STLport-4.5/src/gcc-3.0-mingw.mak 2003-12-14 22:11:36.000000000 +0900 +@@ -1 +1,96 @@ +-dummy ++# ++# Note : this makefile is for gcc-3 ! ++# ++ ++# ++# compiler ++# take these from the OOo build environment ++CC*= gcc ++CXX*= g++ ++ ++# ++# Basename for libraries ++# ++LIB_BASENAME = libstlport_gcc ++ ++# ++# guts for common stuff ++# ++# ++LINK=ar crv ++DYN_LINK=$(CXX) --fexceptions -shared -o ++ ++OBJEXT=o ++DYNEXT=dll ++STEXT=a ++RM=rm -rf ++PATH_SEP=/ ++MKDIR=mkdir -p ++COMP=MINGW32 ++STATIC_SUFFIX=_static ++ ++ ++all: all_dynamic debug_dynamic all_static debug_static ++ ++include common_macros.mak ++ ++# those are defined "Unix way" in common_macros.mak; redefine them here ++RELEASE_DYNLIB=$(RELEASE_NAME).$(DYNEXT) ++DEBUG_DYNLIB=$(DEBUG_NAME).$(DYNEXT) ++STLDEBUG_DYNLIB=$(STLDEBUG_NAME).$(DYNEXT) ++ ++RELEASE_DYNLIB_SONAME=$(RELEASE_DYNLIB) ++DEBUG_DYNLIB_SONAME=$(DEBUG_DYNLIB) ++STLDEBUG_DYNLIB_SONAME=$(STLDEBUG_DYNLIB) ++ ++ALL_DYNAMIC_LIBS=$(OUTDIR)$(PATH_SEP)$(RELEASE_DYNLIB) $(OUTDIR)$(PATH_SEP)$(STLDEBUG_DYNLIB) ++DEBUG_DYNAMIC_LIBS=$(OUTDIR)$(PATH_SEP)$(RELEASE_DYNLIB) $(OUTDIR)$(PATH_SEP)$(STLDEBUG_DYNLIB) ++ ++RESFILE=$(RELEASE_OBJDIR_dynamic)$(PATH_SEP)stlport.o ++RESFILE_debug=$(DEBUG_OBJDIR_dynamic)$(PATH_SEP)stlport.o ++RESFILE_stldebug=$(STLDEBUG_OBJDIR_dynamic)$(PATH_SEP)stlport.o ++ ++WARNING_FLAGS= -Wall -W -Wno-sign-compare -Wno-unused -Wno-uninitialized ++ ++CXXFLAGS_COMMON = -D_MT -fexceptions -I${STLPORT_DIR} ${WARNING_FLAGS} ++ ++CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -O2 ++CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -shared -O2 -D_STLP_USE_DYNAMIC_LIB -D_STLP_DLLEXPORT_NEEDS_PREDECLARATION ++ ++CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g ++CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -shared -g -D_STLP_USE_DYNAMIC_LIB -D_STLP_DLLEXPORT_NEEDS_PREDECLARATION ++ ++CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG ++CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG ++ ++LDFLAGS_RELEASE_static = ++LDFLAGS_RELEASE_dynamic = ${CXXFLAGS_RELEASE_dynamic} -enable-runtime-pseudo-reloc -lmingwthrd -Wl,-Map,${OUTDIR}/${RELEASE_NAME}.map -Wl,--export-all-symbols -Wl,-d -Wl,--out-implib,${OUTDIR}/${RELEASE_NAME}.a ++ ++LDFLAGS_DEBUG_static = ++LDFLAGS_DEBUG_dynamic = ${CXXFLAGS_DEBUG_dynamic} -enable-runtime-pseudo-reloc -lmingwthrd -Wl,-Map,${OUTDIR}/${DEBUG_NAME}.map -Wl,--export-all-symbols -Wl,-d -Wl,--out-implib,${OUTDIR}/${DEBUG_NAME}.a ++ ++LDFLAGS_STLDEBUG_static = ++LDFLAGS_STLDEBUG_dynamic = ${CXXFLAGS_STLDEBUG_dynamic} -enable-runtime-pseudo-reloc -lmingwthrd -Wl,-Map,${OUTDIR}/${STLDEBUG_NAME}.map -Wl,--export-all-symbols -Wl,--out-implib,${OUTDIR}/${STLDEBUG_NAME}.a ++ ++ ++include common_percent_rules.mak ++include common_rules.mak ++ ++ ++ ++${RESFILE}: stlport.rc ++ windres -O coff --define COMP=${COMP} --define BUILD= -o $(RELEASE_OBJDIR_dynamic)$(PATH_SEP)stlport.o stlport.rc ++ ++${RESFILE_debug}: stlport.rc ++ windres -O coff --define COMP=${COMP} --define BUILD=_DEBUG -o $(DEBUG_OBJDIR_dynamic)$(PATH_SEP)stlport.o stlport.rc ++ ++${RESFILE_stldebug}: stlport.rc ++ windres -O coff --define COMP=${COMP} --define BUILD=_STLDEBUG -o $(STLDEBUG_OBJDIR_dynamic)$(PATH_SEP)stlport.o stlport.rc ++ ++#install: all ++# cp -p $(LIB_TARGET) ${D_LIB_TARGET} ../lib ++ ++#%.s: %.cpp ++# $(CXX) $(CXXFLAGS) -O4 -S -pto $< -o $@ ++ ++ +--- misc/build/STLport-4.5/stlport/config/stl_gcc.h.orig 2001-09-05 02:10:16.000000000 +0900 ++++ misc/build/STLport-4.5/stlport/config/stl_gcc.h 2004-01-11 15:36:28.000000000 +0900 +@@ -51,9 +51,27 @@ + # define _STLP_CLASS_EXPORT_DECLSPEC __attribute__((dllexport)) + # define _STLP_CALL + ++# if !defined (_STLP_NO_OWN_IOSTREAMS) ++ ++# if ( defined (__DLL) || defined (_DLL) || defined (_WINDLL) || defined (_RTLDLL) \ ++ || defined(_AFXDLL) || defined (_STLP_USE_DYNAMIC_LIB) ) \ ++ && ! defined (_STLP_USE_STATIC_LIB) ++# undef _STLP_USE_DECLSPEC ++# define _STLP_USE_DECLSPEC 1 ++# endif ++ ++# ifndef _STLP_IMPORT_TEMPLATE_KEYWORD ++# define _STLP_IMPORT_TEMPLATE_KEYWORD extern ++# endif ++# define _STLP_EXPORT_TEMPLATE_KEYWORD ++ ++# endif /* _STLP_OWN_IOSTREAMS */ ++ + # if defined (_STLP_USE_DYNAMIC_LIB) + # define _STLP_USE_DECLSPEC 1 +-# define _STLP_USE_TEMPLATE_EXPORT 1 ++// # define _STLP_USE_TEMPLATE_EXPORT 1 ++/* Using dynamic library in MinGW requires _STLP_NO_CUSTOM_IO */ ++# define _STLP_NO_CUSTOM_IO + # endif + + # endif +@@ -75,6 +93,8 @@ + + # define __unix + ++# if ( __GNUC__ < 3 ) ++ + /* Mac OS X needs one and only one source file to initialize all static data + * members in template classes. Only one source file in an executable or + * library can declare instances for such data members, otherwise duplicate +@@ -97,7 +117,23 @@ + # define _STLP_NATIVE_CPP_C_HEADER(header) <../g++/##header##> + # define _STLP_NATIVE_OLD_STREAMS_HEADER(header) <../g++/##header##> + # define _STLP_NATIVE_CPP_RUNTIME_HEADER(header) <../g++/##header##> +-# endif ++ ++# else ++/* Mac OS X using gcc 3.3 handles all well */ ++# undef _STLP_NO_STATIC_TEMPLATE_DATA ++# define _STLP_STATIC_TEMPLATE_DATA 1 ++# define _STLP_WEAK_ATTRIBUTE 1 ++# undef _STLP_NO_LONG_DOUBLE ++ ++#if 0 ++ /* Mac OS X needs all "::" scope references to be "std::" */ ++ # define _STLP_NO_CSTD_FUNCTION_IMPORTS ++ # undef _STLP_VENDOR_GLOBAL_STD ++ # undef _STLP_VENDOR_GLOBAL_CSTD ++#endif ++ ++# endif /* __GNUC__ < 3 */ ++# endif /* __APPLE__ */ + + + # if defined(__BEOS__) && defined(__INTEL__) +@@ -226,8 +262,10 @@ + + # if (__GNUC__ >= 3) + +-# define _STLP_NATIVE_INCLUDE_PATH ../g++-v3 +-# define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++-v3/backward ++/* properly determine the STLP_NATIVE_INCLUDE_PATH */ ++# define _STLP_NATIVE_INCLUDE_PATH h:/mingw/include/c++/3.3.1 ++# define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH \ ++ h:/mingw/include/c++/3.3.1/backward + + # elif (__GNUC_MINOR__ < 8) + --- ./stlport/STLport-4.5-0119.patch.orig 2003-03-27 20:54:46.000000000 +0900 +++ ./stlport/STLport-4.5-0119.patch 2004-01-11 11:05:30.000000000 +0900 @@ -247,3 +247,183 @@ // wouldn't, for example, simplify the exception-handling code. template +--- misc/build/STLport-4.5-0119/stlport/config/stl_msvc.h.orig 2002-12-28 15:12:58.000000000 +0900 ++++ misc/build/STLport-4.5-0119/stlport/config/stl_msvc.h 2003-07-29 23:09:06.000000000 +0900 +@@ -66,11 +66,11 @@ + # define _STLP_DEFAULTCHAR __stl_char + # endif /* (_STLP_MSVC < 1100 ) */ + ++# if (_STLP_MSVC <= 1300) ++ + # define _STLP_NO_TYPENAME_ON_RETURN_TYPE 1 + // using ::func_name results in ambiguity + +-# if (_STLP_MSVC <= 1300) +- + // boris : not defining this macro for SP5 causes other problems + // # if !defined (_MSC_FULL_VER) || (_MSC_FULL_VER < 12008804 ) + # define _STLP_NO_USING_FOR_GLOBAL_FUNCTIONS 1 +@@ -94,7 +94,11 @@ + # endif /* _STLP_MSVC */ + + +-# if (_MSC_VER <= 1300) ++# if (_MSC_VER >= 1310) ++#define _STLP_NO_METHOD_SPECIALIZATION ++#endif ++ ++# if (_MSC_VER <= 1310) + + # define _STLP_VENDOR_GLOBAL_CSTD + // They included the necessary coding, +@@ -104,7 +108,7 @@ + # if !defined (_STLP_WHOLE_NATIVE_STD) && ! defined (_STLP_REDEFINE_STD) + # define _STLP_REDEFINE_STD + # endif +-# endif /* (_MSC_VER <= 1300) */ ++# endif /* (_MSC_VER <= 1310) */ + + # if (_MSC_VER <= 1200) // including MSVC 6.0 + // these work, as long they are inline +--- misc/build/STLport-4.5-0119/src/gcc-3.0-mingw.mak.orig 2004-01-11 07:26:02.000000000 +0900 ++++ misc/build/STLport-4.5-0119/src/gcc-3.0-mingw.mak 2004-01-11 10:58:42.000000000 +0900 +@@ -1 +1,96 @@ +-dummy ++# ++# Note : this makefile is for gcc-3 ! ++# ++ ++# ++# compiler ++# take these from the OOo build environment ++CC*= gcc ++CXX*= g++ ++ ++# ++# Basename for libraries ++# ++LIB_BASENAME = libstlport_gcc ++ ++# ++# guts for common stuff ++# ++# ++LINK=ar crv ++DYN_LINK=$(CXX) --fexceptions -shared -o ++ ++OBJEXT=o ++DYNEXT=dll ++STEXT=a ++RM=rm -rf ++PATH_SEP=/ ++MKDIR=mkdir -p ++COMP=MINGW32 ++STATIC_SUFFIX=_static ++ ++ ++all: all_dynamic debug_dynamic all_static debug_static ++ ++include common_macros.mak ++ ++# those are defined "Unix way" in common_macros.mak; redefine them here ++RELEASE_DYNLIB=$(RELEASE_NAME).$(DYNEXT) ++DEBUG_DYNLIB=$(DEBUG_NAME).$(DYNEXT) ++STLDEBUG_DYNLIB=$(STLDEBUG_NAME).$(DYNEXT) ++ ++RELEASE_DYNLIB_SONAME=$(RELEASE_DYNLIB) ++DEBUG_DYNLIB_SONAME=$(DEBUG_DYNLIB) ++STLDEBUG_DYNLIB_SONAME=$(STLDEBUG_DYNLIB) ++ ++ALL_DYNAMIC_LIBS=$(OUTDIR)$(PATH_SEP)$(RELEASE_DYNLIB) $(OUTDIR)$(PATH_SEP)$(STLDEBUG_DYNLIB) ++DEBUG_DYNAMIC_LIBS=$(OUTDIR)$(PATH_SEP)$(RELEASE_DYNLIB) $(OUTDIR)$(PATH_SEP)$(STLDEBUG_DYNLIB) ++ ++RESFILE=$(RELEASE_OBJDIR_dynamic)$(PATH_SEP)stlport.o ++RESFILE_debug=$(DEBUG_OBJDIR_dynamic)$(PATH_SEP)stlport.o ++RESFILE_stldebug=$(STLDEBUG_OBJDIR_dynamic)$(PATH_SEP)stlport.o ++ ++WARNING_FLAGS= -Wall -W -Wno-sign-compare -Wno-unused -Wno-uninitialized ++ ++CXXFLAGS_COMMON = -D_MT -fexceptions -I${STLPORT_DIR} ${WARNING_FLAGS} ++ ++CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -O2 ++CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -shared -O2 -D_STLP_USE_DYNAMIC_LIB -D_STLP_DLLEXPORT_NEEDS_PREDECLARATION ++ ++CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g ++CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -shared -g -D_STLP_USE_DYNAMIC_LIB -D_STLP_DLLEXPORT_NEEDS_PREDECLARATION ++ ++CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG ++CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG ++ ++LDFLAGS_RELEASE_static = ++LDFLAGS_RELEASE_dynamic = ${CXXFLAGS_RELEASE_dynamic} -enable-runtime-pseudo-reloc -lmingwthrd -Wl,-Map,${OUTDIR}/${RELEASE_NAME}.map -Wl,--export-all-symbols -Wl,-d -Wl,--out-implib,${OUTDIR}/${RELEASE_NAME}.a ++ ++LDFLAGS_DEBUG_static = ++LDFLAGS_DEBUG_dynamic = ${CXXFLAGS_DEBUG_dynamic} -enable-runtime-pseudo-reloc -lmingwthrd -Wl,-Map,${OUTDIR}/${DEBUG_NAME}.map -Wl,--export-all-symbols -Wl,-d -Wl,--out-implib,${OUTDIR}/${DEBUG_NAME}.a ++ ++LDFLAGS_STLDEBUG_static = ++LDFLAGS_STLDEBUG_dynamic = ${CXXFLAGS_STLDEBUG_dynamic} -enable-runtime-pseudo-reloc -lmingwthrd -Wl,-Map,${OUTDIR}/${STLDEBUG_NAME}.map -Wl,--export-all-symbols -Wl,--out-implib,${OUTDIR}/${STLDEBUG_NAME}.a ++ ++ ++include common_percent_rules.mak ++include common_rules.mak ++ ++ ++ ++${RESFILE}: stlport.rc ++ windres -O coff --define COMP=${COMP} --define BUILD= -o $(RELEASE_OBJDIR_dynamic)$(PATH_SEP)stlport.o stlport.rc ++ ++${RESFILE_debug}: stlport.rc ++ windres -O coff --define COMP=${COMP} --define BUILD=_DEBUG -o $(DEBUG_OBJDIR_dynamic)$(PATH_SEP)stlport.o stlport.rc ++ ++${RESFILE_stldebug}: stlport.rc ++ windres -O coff --define COMP=${COMP} --define BUILD=_STLDEBUG -o $(STLDEBUG_OBJDIR_dynamic)$(PATH_SEP)stlport.o stlport.rc ++ ++#install: all ++# cp -p $(LIB_TARGET) ${D_LIB_TARGET} ../lib ++ ++#%.s: %.cpp ++# $(CXX) $(CXXFLAGS) -O4 -S -pto $< -o $@ ++ ++ +--- misc/build/STLport-4.5-0119/stlport/config/stl_gcc.h.orig 2002-12-29 14:34:46.000000000 +0900 ++++ misc/build/STLport-4.5-0119/stlport/config/stl_gcc.h 2004-01-11 10:50:48.000000000 +0900 +@@ -72,9 +72,25 @@ + # define _STLP_CLASS_EXPORT_DECLSPEC __attribute__((dllexport)) + # define _STLP_CALL + ++# if !defined (_STLP_NO_OWN_IOSTREAMS) ++ ++# if ( defined (__DLL) || defined (_DLL) || defined (_WINDLL) || defined (_RTLDLL) \ ++ || defined(_AFXDLL) || defined (_STLP_USE_DYNAMIC_LIB) ) \ ++ && ! defined (_STLP_USE_STATIC_LIB) ++# undef _STLP_USE_DECLSPEC ++# define _STLP_USE_DECLSPEC 1 ++# endif ++ ++# ifndef _STLP_IMPORT_TEMPLATE_KEYWORD ++# define _STLP_IMPORT_TEMPLATE_KEYWORD extern ++# endif ++# define _STLP_EXPORT_TEMPLATE_KEYWORD ++ ++# endif /* _STLP_OWN_IOSTREAMS */ ++ + # if defined (_STLP_USE_DYNAMIC_LIB) + # define _STLP_USE_DECLSPEC 1 +-// # define _STLP_USE_TEMPLATE_EXPORT 1 ++# define _STLP_USE_TEMPLATE_EXPORT 1 + /* Using dynamic library in MinGW requires _STLP_NO_CUSTOM_IO */ + # define _STLP_NO_CUSTOM_IO + # endif +@@ -254,8 +270,10 @@ + + # if (__GNUC__ >= 3) + +-# define _STLP_NATIVE_INCLUDE_PATH ../g++-v3 +-# define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++-v3/backward ++/* properly determine the STLP_NATIVE_INCLUDE_PATH */ ++# define _STLP_NATIVE_INCLUDE_PATH h:/mingw/include/c++/3.3.1 ++# define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH \ ++ h:/mingw/include/c++/3.3.1/backward + + # elif (__GNUC_MINOR__ < 8) + --- ./i18npool/source/indexentry/indexentrysupplier_default.cxx.orig 2002-09-27 15:34:08.000000000 +0900 +++ ./i18npool/source/indexentry/indexentrysupplier_default.cxx 2004-01-14 21:37:14.000000000 +0900 @@ -69,6 +69,10 @@ namespace com { namespace sun { namespace star { namespace i18n { +static inline sal_Bool SAL_CALL operator == (const Locale& l1, const Locale& l2) { + return l1.Language == l2.Language && l1.Country == l2.Country && l1.Variant == l2.Variant; +} + IndexEntrySupplier_Unicode::IndexEntrySupplier_Unicode(const Reference < XMultiServiceFactory >& rxMSF) : IndexEntrySupplier(rxMSF) { --- ./i18npool/source/indexentry/indexentrysupplier.cxx.orig 2003-04-24 20:07:14.000000000 +0900 +++ ./i18npool/source/indexentry/indexentrysupplier.cxx 2004-01-14 21:37:04.000000000 +0900 @@ -238,7 +238,7 @@ if (address != 0xFFFF) address = PhoneticCharacter_ko[address + (ch & 0xFF)]; if (address != 0xFFFF) - candidate += OUString(address); + candidate += OUString::valueOf(sal_Unicode(address)); else candidate += space; } @@ -269,13 +269,13 @@ getIndexCharacter( rIndexEntry, rLocale, rSortAlgorithm ); } -#if (_MSC_VER < 1300) -sal_Bool SAL_CALL operator == (const Locale& l1, const Locale& l2) { +//#if (_MSC_VER < 1300) +static inline sal_Bool SAL_CALL operator == (const Locale& l1, const Locale& l2) { return l1.Language == l2.Language && l1.Country == l2.Country && l1.Variant == l2.Variant; } -#else -extern sal_Bool SAL_CALL operator == (const Locale& l1, const Locale& l2); -#endif +//#else +//extern sal_Bool SAL_CALL operator == (const Locale& l1, const Locale& l2); +//#endif sal_Bool SAL_CALL IndexEntrySupplier::createLocaleSpecificIndexEntrySupplier(const OUString& name) throw( RuntimeException ) { --- ./i18npool/prj/d.lst.orig 2003-04-24 20:04:56.000000000 +0900 +++ ./i18npool/prj/d.lst 2004-01-13 07:27:20.000000000 +0900 @@ -5,20 +5,24 @@ ..\%__SRC%\bin\i18npool*.dll %_DEST%\bin%_EXT%\i18npool*.dll ..\%__SRC%\lib\libi18npool*.so %_DEST%\lib%_EXT%\libi18npool*.so +..\%__SRC%\lib\libi18npool*.a %_DEST%\lib%_EXT%\libi18npool*.a ..\%__SRC%\lib\libi18npool*.dylib %_DEST%\lib%_EXT%\libi18npool*.dylib ..\%__SRC%\lib\ii18npool.lib %_DEST%\lib%_EXT%\ii18npool.lib ..\%__SRC%\bin\i18nsearch*.dll %_DEST%\bin%_EXT%\i18nsearch*.dll ..\%__SRC%\lib\libi18nsearch*.so %_DEST%\lib%_EXT%\libi18nsearch*.so +..\%__SRC%\lib\libi18nsearch*.a %_DEST%\lib%_EXT%\libi18nsearch*.a ..\%__SRC%\lib\libi18nsearch*.dylib %_DEST%\lib%_EXT%\libi18nsearch*.dylib ..\%__SRC%\lib\ii18nsearch.lib %_DEST%\lib%_EXT%\ii18nsearch.lib ..\%__SRC%\bin\localedata_*.dll %_DEST%\bin%_EXT%\localedata_*.dll ..\%__SRC%\lib\liblocaledata_*.so %_DEST%\lib%_EXT%\liblocaledata_*.so +..\%__SRC%\lib\liblocaledata_*.a %_DEST%\lib%_EXT%\liblocaledata_*.a ..\%__SRC%\lib\liblocaledata_*.dylib %_DEST%\lib%_EXT%\liblocaledata_*.dylib ..\%__SRC%\bin\dict_*.dll %_DEST%\bin%_EXT%\dict_*.dll ..\%__SRC%\lib\libdict_*.so %_DEST%\lib%_EXT%\libdict_*.so +..\%__SRC%\lib\libdict_*.a %_DEST%\lib%_EXT%\libdict_*.a ..\%__SRC%\lib\libdict_*.dylib %_DEST%\lib%_EXT%\libdict_*.dylib ..\%__SRC%\lib\lib*static*.dylib %_DEST%\lib%_EXT%\lib*static*.dylib --- ./i18npool/inc/indexentrysupplier.hxx.orig 2003-04-24 20:02:54.000000000 +0900 +++ ./i18npool/inc/indexentrysupplier.hxx 2004-01-14 21:32:08.000000000 +0900 @@ -140,9 +140,13 @@ sal_Char *implementationName; com::sun::star::lang::Locale aLocale; rtl::OUString aSortAlgorithm; - friend sal_Bool SAL_CALL operator == (const com::sun::star::lang::Locale& l1, const com::sun::star::lang::Locale& l2); +// friend sal_Bool SAL_CALL operator == (const com::sun::star::lang::Locale& l1, const com::sun::star::lang::Locale& l2); }; +//inline sal_Bool operator == (const com::sun::star::lang::Locale& l1, const com::sun::star::lang::Locale& l2) { +// return l1.Language == l2.Language && l1.Country == l2.Country && l1.Variant == l2.Variant; +//}; + } } } } #endif --- ./sablot/prj/d.lst.orig 2001-08-21 20:00:28.000000000 +0900 +++ ./sablot/prj/d.lst 2004-01-18 12:32:52.000000000 +0900 @@ -5,4 +5,5 @@ ..\%__SRC%\slb\sablot.lib %_DEST%\lib%_EXT%\sablot.lib ..\%__SRC%\lib\libsablot.a %_DEST%\lib%_EXT%\libsablot.a +..\%__SRC%\lib\libsablot_static.a %_DEST%\lib%_EXT%\libsablot_static.a --- ./fpicker/source/win32/folderpicker/FolderPicker.cxx.orig 2001-10-09 17:07:04.000000000 +0900 +++ ./fpicker/source/win32/folderpicker/FolderPicker.cxx 2004-01-18 02:00:38.000000000 +0900 @@ -242,6 +242,7 @@ // ------------------------------------------------- void SAL_CALL CFolderPicker::cancel( ) + throw(RuntimeException) { OSL_ASSERT( m_pFolderPickerImpl.get( ) ); MutexGuard aGuard( m_aMutex ); --- ./fpicker/source/win32/folderpicker/FolderPicker.hxx.orig 2001-10-09 17:07:04.000000000 +0900 +++ ./fpicker/source/win32/folderpicker/FolderPicker.hxx 2004-01-18 01:59:46.000000000 +0900 @@ -150,7 +150,8 @@ // XCancellable //------------------------------------------------ - virtual void SAL_CALL cancel( ); + virtual void SAL_CALL cancel( ) + throw(::com::sun::star::uno::RuntimeException); //------------------------------------------------ // overwrite base class method, which is called --- ./fpicker/source/win32/folderpicker/MtaFop.cxx.orig 2003-03-26 03:05:06.000000000 +0900 +++ ./fpicker/source/win32/folderpicker/MtaFop.cxx 2004-01-18 01:58:28.000000000 +0900 @@ -74,7 +74,121 @@ #include "MtaFop.hxx" #include #include +#ifdef __MINGW32__ +template +class XWindowsComPtr +{ +public: + XWindowsComPtr() + { + p=NULL; + } + ~XWindowsComPtr() + { + if (p) + p->Release(); + } + XWindowsComPtr(const XWindowsComPtr& lp) + { + if ((p = lp.p) != NULL) + p->AddRef(); + } + XWindowsComPtr(T* lp) + { + if ((p = lp) != NULL) + p->AddRef(); + } + T* operator=(const XWindowsComPtr& lp) + { + return assign(lp.p); + } + T* operator=(T* lp) + { + return assign(lp); + } + bool operator!() const + { + return (p == NULL); + } + operator T*() const + { + return p; + } + T* operator->() const + { + return p; + } + T** operator&() + { + return &p; + } +private: + T* assign(T* lp) + { + if (lp != NULL) + lp->AddRef(); + if (p) + p->Release(); + return p = lp; + } + bool operator==(T* pT) const + { + return p == pT; + } + T* p; +}; +typedef XWindowsComPtr< IMalloc > IMallocPtr; +typedef XWindowsComPtr< IShellFolder > IShellFolderPtr; +class _com_error { +public: + // Constructors + // + _com_error(HRESULT hr, + IErrorInfo* perrinfo = NULL, + bool fAddRef = false) throw(); + _com_error(const _com_error& that) throw(); + + // Destructor + // + virtual ~_com_error() throw(); + + // Assignment operator + // + _com_error& operator=(const _com_error& that) throw(); + + // Accessors + // + HRESULT Error() const throw() { return m_hresult; } + WORD WCode() const throw(); + IErrorInfo * ErrorInfo() const throw(); + + // IErrorInfo method accessors + // +// _bstr_t Description() const throw(_com_error); + DWORD HelpContext() const throw(); +// _bstr_t HelpFile() const throw(_com_error); +// _bstr_t Source() const throw(_com_error); +// GUID GUID() const throw(); + + // FormatMessage accessors + const TCHAR * ErrorMessage() const throw(); + + // EXCEPINFO.wCode <-> HRESULT mappers + static HRESULT WCodeToHRESULT(WORD wCode) throw(); + static WORD HRESULTToWCode(HRESULT hr) throw(); + +private: + enum { + WCODE_HRESULT_FIRST = MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0x200), + WCODE_HRESULT_LAST = MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF+1, 0) - 1 + }; + const HRESULT m_hresult; + IErrorInfo * m_perrinfo; + mutable TCHAR * m_pszMsg; +}; +#else #include +#endif #ifndef _RESOURCEPROVIDER_HXX_ #include "..\misc\resourceprovider.hxx" --- ./fpicker/source/win32/folderpicker/MtaFop.hxx.orig 2002-03-27 19:41:14.000000000 +0900 +++ ./fpicker/source/win32/folderpicker/MtaFop.hxx 2004-01-18 01:48:58.000000000 +0900 @@ -75,6 +75,9 @@ #endif #include +#ifdef __MINGW32__ +#include +#endif #include #include --- ./fpicker/source/win32/filepicker/FilePicker.cxx.orig 2003-03-26 03:04:56.000000000 +0900 +++ ./fpicker/source/win32/filepicker/FilePicker.cxx 2004-01-18 01:38:52.000000000 +0900 @@ -403,7 +403,7 @@ //----------------------------------------------------------------------------------------- void SAL_CALL CFilePicker::setDefaultName(const rtl::OUString& aName) - throw(lang::IllegalArgumentException, uno::RuntimeException) + throw(uno::RuntimeException) { OSL_ASSERT(0 != m_pImpl.get()); osl::MutexGuard aGuard(m_aMutex); @@ -760,6 +760,7 @@ //------------------------------------------------------------------------------------ void SAL_CALL CFilePicker::cancel() + throw(uno::RuntimeException) { OSL_ASSERT(m_pImpl.get()); --- ./fpicker/source/win32/filepicker/FilePicker.hxx.orig 2002-11-26 18:22:00.000000000 +0900 +++ ./fpicker/source/win32/filepicker/FilePicker.hxx 2004-01-18 01:37:48.000000000 +0900 @@ -183,7 +183,7 @@ throw( ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL setDefaultName( const ::rtl::OUString& aName ) - throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL setDisplayDirectory( const ::rtl::OUString& aDirectory ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ); @@ -262,7 +262,8 @@ // XCancellable //------------------------------------------------ - virtual void SAL_CALL cancel( ); + virtual void SAL_CALL cancel( ) + throw(::com::sun::star::uno::RuntimeException); //------------------------------------------------ // XEventListener @@ -305,7 +306,7 @@ CFilePicker& operator=( const CFilePicker& ); private: - ::com::sun::star::uno::Reference<::com::sun::star::lang::XMultiServiceFactory> m_xServiceMgr; // to instanciate own services + ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceMgr; // to instanciate own services CAsyncEventNotifier m_aAsyncEventNotifier; std::auto_ptr m_pImpl; }; --- ./berkeleydb/prj/d.lst.orig 2003-07-17 02:13:20.000000000 +0900 +++ ./berkeleydb/prj/d.lst 2004-01-13 21:59:58.000000000 +0900 @@ -11,6 +11,10 @@ ..\%__SRC%\lib\libdb_java-3.2.so %_DEST%\lib%_EXT%\libdb_java-3.2.so ..\%__SRC%\lib\libdb_cxx-3.2.so %_DEST%\lib%_EXT%\libdb_cxx-3.2.so +..\%__SRC%\lib\libdb-3.2.a %_DEST%\lib%_EXT%\libdb-3.2.a +..\%__SRC%\lib\libdb_java-3.2.a %_DEST%\lib%_EXT%\libdb_java-3.2.a +..\%__SRC%\lib\libdb_cxx-3.2.a %_DEST%\lib%_EXT%\libdb_cxx-3.2.a + ..\%__SRC%\lib\libdb-3.2.dylib %_DEST%\lib%_EXT%\libdb-3.2.dylib ..\%__SRC%\lib\libdb_java-3.2.dylib %_DEST%\lib%_EXT%\libdb_java-3.2.dylib ..\%__SRC%\lib\libdb_cxx-3.2.dylib %_DEST%\lib%_EXT%\libdb_cxx-3.2.dylib --- ./berkeleydb/db-3.2.9.patch.orig 2003-07-17 02:44:54.000000000 +0900 +++ ./berkeleydb/db-3.2.9.patch 2003-11-02 13:37:04.000000000 +0900 @@ -43,157 +43,6 @@ CC= @MAKEFILE_CC@ CCLINK= @MAKEFILE_CCLINK@ -*** misc/db-3.2.9/dist/configure 2001-01-24 16:16:18.000000000 +0100 ---- misc/build/db-3.2.9/dist/configure 2003-07-16 19:34:25.000000000 +0200 -*************** -*** 995,1000 **** ---- 995,1003 ---- - CPPFLAGS="-D_REENTRANT $CPPFLAGS";; - mpeix*) CPPFLAGS="-D_POSIX_SOURCE -D_SOCKET_SOURCE $CPPFLAGS" - LIBS="-lsocket -lsvipc $LIBS";; -+ netbsd*) optimize_def="-O2";; -+ darwin*) optimize_def="-O2" -+ CPPFLAGS="-D_REENTRANT -malign-natural -no-cpp-precomp $CPPFLAGS";; - osf*) CPPFLAGS="-D_REENTRANT $CPPFLAGS";; - *qnx) cat >> confdefs.h <<\EOF - #define HAVE_QNX 1 -*************** -*** 1644,1650 **** - - INSTALLER="\$(LIBTOOL) --mode=install cp" - POSTLINK="\$(LIBTOOL) --mode=execute true" -! SOLINK="\$(LIBTOOL) --mode=link ${SAVE_CC} -avoid-version" - SOFLAGS="-rpath \$(libdir)" - o=".lo" - fi ---- 1647,1660 ---- - - INSTALLER="\$(LIBTOOL) --mode=install cp" - POSTLINK="\$(LIBTOOL) --mode=execute true" -! case "$host_os" in -! darwin*) -! SOLINK="\$(LIBTOOL) --mode=link g++ -avoid-version" -! ;; -! *) -! SOLINK="\$(LIBTOOL) --mode=link ${SAVE_CC} -avoid-version" -! ;; -! esac - SOFLAGS="-rpath \$(libdir)" - o=".lo" - fi -*************** -*** 1750,1757 **** - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then -! ac_cv_path_JAVACABS="$ac_dir/$ac_word" -! break - fi - done - IFS="$ac_save_ifs" ---- 1760,1769 ---- - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then -! if test $SOLARENV/$OUTPATH/bin != $ac_dir; then -! ac_cv_path_JAVACABS="$ac_dir/$ac_word" -! break -! fi - fi - done - IFS="$ac_save_ifs" -*************** -*** 1781,1800 **** - echo "$ac_t""$JAVACABS" 1>&6 - done - JTOPDIR=`echo "$JAVACABS" | sed -e 's://*:/:g' -e 's:/[^/]*$::'` -! if test -f "$JTOPDIR/include/jni.h"; then -! CPPFLAGS="$CPPFLAGSS -I$JTOPDIR/include" -! else -! JTOPDIR=`echo "$JTOPDIR" | sed -e 's:/[^/]*$::'` -! if test -f "$JTOPDIR/include/jni.h"; then -! CPPFLAGS="$CPPFLAGS -I$JTOPDIR/include" -! else -! { echo "configure: error: cannot find java include files" 1>&2; exit 1; } -! fi -! fi - - case "$host_os" in - solaris*) JINCSUBDIRS="solaris";; - linux*) JINCSUBDIRS="linux genunix";; - *) JINCSUBDIRS="genunix";; - esac - ---- 1793,1833 ---- - echo "$ac_t""$JAVACABS" 1>&6 - done - JTOPDIR=`echo "$JAVACABS" | sed -e 's://*:/:g' -e 's:/[^/]*$::'` -! # [ed] 12/23/01 On OS X/darwin the java include directory is named the traditional Headers -! # name and not include -! # [ed] 2/28/02 Make this generic for darwin -! case "$host_os" in -! darwin*) -! JFRAMEDIR=`echo "$JTOPDIR" | sed -e 's:JavaVM.framework.*$:JavaVM.framework:'` -! echo "$JFRAMEDIR" -! if test -f "$JFRAMEDIR/Headers/jni.h"; then -! CPPFLAGS="$CPPFLAGS -I$JFRAMEDIR/Headers -I$JFRAMEDIR/Headers" -! elif test -f "$JFRAMEDIR/Versions/1.3.1/Headers/jni.h"; then -! CPPFLAGS="$CPPFLAGS -I$JFRAMEDIR/Headers -I$JFRAMEDIR/Versions/1.3.1/Headers" -! else -! { echo "configure: error: cannot find java include files (Darwin: $JFRAMEDIR/Versions/1.3.1/Headers/jni.h)" 1>&2; exit 1; } -! fi -! ;; -! *) -! if test -f "$JTOPDIR/include/jni.h"; then -! CPPFLAGS="$CPPFLAGS -I$JTOPDIR/include" -! else -! JTOPDIR=`echo "$JTOPDIR" | sed -e 's:/[^/]*$::'` -! if test -f "$JTOPDIR/include/jni.h"; then -! CPPFLAGS="$CPPFLAGS -I$JTOPDIR/include" -! else -! { echo "configure: error: cannot find java include files" 1>&2; exit 1; } -! fi -! fi -! ;; -! esac - - case "$host_os" in - solaris*) JINCSUBDIRS="solaris";; - linux*) JINCSUBDIRS="linux genunix";; -+ irix*) JINCSUBDIRS="irix";; -+ freebsd*) JINCSUBDIRS="freebsd bsd linux genunix";; -+ netbsd*) JINCSUBDIRS="netbsd linux solaris genunix";; - *) JINCSUBDIRS="genunix";; - esac - -*************** -*** 4008,4014 **** - #line 4009 "configure" - #include "confdefs.h" - main(){ -! #if defined(__powerpc__) - #if defined(__GNUC__) - exit(0); - #endif ---- 4041,4047 ---- - #line 4009 "configure" - #include "confdefs.h" - main(){ -! #if defined(__powerpc__) || defined(__ppc__) - #if defined(__GNUC__) - exit(0); - #endif -*************** -*** 5375,5382 **** - fi - fi - -- -- - CREATE_LIST="Makefile - include.tcl:../test/include.tcl - db.h:../include/db.src ---- 5408,5413 ---- *** misc/db-3.2.9/dist/configure.in 2001-01-19 18:36:43.000000000 +0100 --- misc/build/db-3.2.9/dist/configure.in 2003-07-16 19:34:25.000000000 +0200 *************** @@ -206,281 +55,766 @@ *) JINCSUBDIRS="genunix";; esac -*** misc/db-3.2.9/dist/ltconfig 2000-10-13 22:23:00.000000000 +0200 ---- misc/build/db-3.2.9/dist/ltconfig 2003-07-16 19:35:54.000000000 +0200 -*************** -*** 678,683 **** ---- 678,688 ---- - cygwin* | mingw* | os2*) - # We can build DLLs from non-PIC. - ;; -+ darwin* | rhapsody*) -+ # PIC is the default on this platform -+ # Common symbols not allowed in MH_DYLIB files -+ pic_flag='-fno-common' -+ ;; - amigaos*) - # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, -*************** -*** 1194,1204 **** - - netbsd*) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -! else - archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib' - # can we support soname and/or expsyms with a.out? -oliva - fi - ;; - ---- 1199,1221 ---- - - netbsd*) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -+ archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib' -+ # can we support soname and/or expsyms with a.out? -oliva -+ else - archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -! need_version=no -! fi -! ;; -! -! freebsd*) -! if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib' - # can we support soname and/or expsyms with a.out? -oliva -+ else -+ archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ need_version=no - fi - ;; - -*************** -*** 1371,1376 **** ---- 1388,1410 ---- - hardcode_shlibpath_var=no - ;; - -+ darwin* | rhapsody*) -+ case "$host_os" in -+ rhapsody* | darwin1.[012]) -+ allow_undefined_flag='-undefined suppress' -+ ;; -+ *) # Darwin 1.3 on -+ allow_undefined_flag='-undefined error' -+ ;; -+ esac -+ archive_cmds='$nonopt $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag $SOLARLIB -lstlport_gcc -o $lib $libobjs $deplibs $linkopts -install_name $rpath/$soname $verstring' -+ # We need to add '_' to the symbols in $export_symbols first -+ #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols $lib' -+ hardcode_direct=yes -+ hardcode_shlibpath_var=no -+ whole_archive_flag_spec='-all_load $convenience' -+ ;; -+ - hpux9* | hpux10* | hpux11*) - case "$host_os" in - hpux9*) archive_cmds='$rm $objdir/$soname~$LD -b +b $install_libdir -o $objdir/$soname $libobjs $deplibs $linkopts~test $objdir/$soname = $lib || mv $objdir/$soname $lib' ;; -*************** -*** 1443,1455 **** - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator=: - ;; -! rhapsody*) -! archive_cmds='$CC -bundle -undefined suppress -o $lib $libobjs $deplibs $linkopts' -! hardcode_libdir_flags_spec='-L$libdir' -! hardcode_direct=yes -! hardcode_shlibpath_var=no -! ;; -! - sco3.2v5*) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts' - hardcode_shlibpath_var=no ---- 1477,1483 ---- - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator=: - ;; -! - sco3.2v5*) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts' - hardcode_shlibpath_var=no -*************** -*** 1919,1924 **** ---- 1947,1973 ---- - esac - ;; - -+ darwin* | rhapsody*) -+ dynamic_linker="$host_os dyld" -+ version_type=darwin -+ need_lib_prefix=no -+ need_version=no -+ deplibs_check_method='file_magic Mach-O dynamically linked shared library' -+ file_magic_cmd='/usr/bin/file -L' -+ case "$host_os" in -+ rhapsody* | darwin1.[012]) -+ file_magic_test_file='/System/Library/Frameworks/System.framework/System' -+ ;; -+ *) # Darwin 1.3 on -+ file_magic_test_file='/usr/lib/libSystem.dylib' -+ ;; -+ esac -+ library_names_spec='${libname}${release}${versuffix}.$(test .$module = .yes && echo so || echo dylib) ${libname}${release}${major}.$(test .$module = .yes && echo so || echo dylib) ${libname}.$(test .$module = .yes && echo so || echo dylib)' -+ soname_spec='${libname}${release}${major}.$(test .$module = .yes && echo so || echo dylib)' -+ shlibpath_overrides_runpath=yes -+ shlibpath_var=DYLD_LIBRARY_PATH -+ ;; -+ - gnu*) - version_type=linux - need_lib_prefix=no -*************** -*** 1955,1961 **** - version_type=irix - need_lib_prefix=no - need_version=no -! soname_spec='${libname}${release}.so.$major' - library_names_spec='${libname}${release}.so.$versuffix ${libname}${release}.so.$major ${libname}${release}.so $libname.so' - case "$host_os" in - irix5*) ---- 2004,2010 ---- - version_type=irix - need_lib_prefix=no - need_version=no -! soname_spec='${libname}${release}.so' - library_names_spec='${libname}${release}.so.$versuffix ${libname}${release}.so.$major ${libname}${release}.so $libname.so' - case "$host_os" in - irix5*) -*************** -*** 2023,2028 **** ---- 2072,2091 ---- - shlibpath_var=LD_LIBRARY_PATH - ;; - -+ freebsd*) -+ version_type=sunos -+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -+ library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix' -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' -+ dynamic_linker='FreeBSD (a.out) ld.so' -+ else -+ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so' -+ soname_spec='${libname}${release}.so$major' -+ dynamic_linker='FreeBSD ld.elf_so' -+ fi -+ shlibpath_var=LD_LIBRARY_PATH -+ ;; -+ - openbsd*) - version_type=sunos - if test "$with_gnu_ld" = yes; then -*************** -*** 2057,2070 **** - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" - ;; - -- rhapsody*) -- version_type=sunos -- library_names_spec='${libname}.so' -- soname_spec='${libname}.so' -- shlibpath_var=DYLD_LIBRARY_PATH -- deplibs_check_method=pass_all -- ;; -- - sco3.2v5*) - version_type=osf - soname_spec='${libname}${release}.so$major' ---- 2120,2125 ---- -*** misc/db-3.2.9/dist/ltmain.sh 2000-08-06 20:32:00.000000000 +0200 ---- misc/build/db-3.2.9/dist/ltmain.sh 2003-07-16 19:34:25.000000000 +0200 -*************** -*** 1079,1084 **** ---- 1079,1089 ---- - # These systems don't actually have c library (as such) - continue - ;; -+ *-*-rhapsody* | *-*-darwin1.[012]) -+ # Rhapsody C library is in the System framework -+ deplibs="$deplibs -framework System" -+ continue -+ ;; - esac - elif test "$arg" = "-lm"; then - case "$host" in -*************** -*** 1086,1091 **** ---- 1091,1101 ---- - # These systems don't actually have math library (as such) - continue - ;; -+ *-*-rhapsody* | *-*-darwin1.[012]) -+ # Rhapsody math library is in the System framework -+ deplibs="$deplibs -framework System" -+ continue -+ ;; - esac - fi - deplibs="$deplibs $arg" -*************** -*** 1753,1758 **** ---- 1763,1778 ---- - versuffix="-$major-$age-$revision" - ;; - -+ darwin) -+ # Like Linux, but with the current version available in -+ # verstring for coding it into the library header -+ major=.`expr $current - $age` -+ versuffix="$major.$age.$revision" -+ # Darwin ld doesn't like 0 for these options... -+ minor_current=`expr $current + 1` -+ verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" -+ ;; -+ - *) - $echo "$modename: unknown library version type \`$version_type'" 1>&2 - echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 -*************** -*** 1763,1769 **** - # Clear the version info if we defaulted, and they specified a release. - if test -z "$vinfo" && test -n "$release"; then - major= -! verstring="0.0" - if test "$need_version" = no; then - versuffix= - else ---- 1783,1798 ---- - # Clear the version info if we defaulted, and they specified a release. - if test -z "$vinfo" && test -n "$release"; then - major= -! case "$version_type" in -! darwin) -! # we can't check for "0.0" in archive_cmds due to quoting -! # problems, so we reset it completely -! verstring="" -! ;; -! *) -! verstring="0.0" -! ;; -! esac - if test "$need_version" = no; then - versuffix= - else -*************** -*** 1803,1808 **** ---- 1832,1842 ---- - # defer to whether the user wants -lc, or -lc_r - ;; - -+ *-*-rhapsody* | *-*-darwin1.[012]) -+ # Rhapsody C library is in the System framework -+ deplibs="$deplibs -framework System" -+ ;; +--- misc/build/db-3.2.9/build_win32/db_config.h.orig 2001-01-12 03:28:20.000000000 +0900 ++++ misc/build/db-3.2.9/build_win32/db_config.h 2003-07-30 00:44:40.000000000 +0900 +@@ -215,8 +215,12 @@ + #include + + #if defined(__cplusplus) ++#if (_MSC_VER >= 1300) ++#include ++#else + #include + #endif ++#endif + + /* + * To build Tcl interface libraries, the include path must be configured to +--- misc/build/db-3.2.9/include/db_cxx.h.orig 2001-01-12 03:28:56.000000000 +0900 ++++ misc/build/db-3.2.9/include/db_cxx.h 2003-07-30 01:07:34.000000000 +0900 +@@ -49,7 +49,12 @@ + // Forward declarations + // + ++#if (_MSC_VER >= 1300) ++#include ++using namespace std; ++#else + #include ++#endif + #include + #include "db.h" + +--- misc/build/db-3.2.9/os/os_oflags.c.orig 2000-10-28 23:57:50.000000000 +0900 ++++ misc/build/db-3.2.9/os/os_oflags.c 2003-11-01 17:18:30.000000000 +0900 +@@ -75,17 +75,42 @@ + #ifndef S_IRUSR + #ifdef DB_WIN32 + #define S_IRUSR S_IREAD /* R for owner */ +-#define S_IWUSR S_IWRITE /* W for owner */ +-#define S_IRGRP 0 /* R for group */ +-#define S_IWGRP 0 /* W for group */ +-#define S_IROTH 0 /* R for other */ +-#define S_IWOTH 0 /* W for other */ + #else + #define S_IRUSR 0000400 /* R for owner */ ++#endif /* DB_WIN32 */ ++#endif ++#ifndef S_IWUSR ++#ifdef DB_WIN32 ++#define S_IWUSR S_IWRITE /* W for owner */ ++#else + #define S_IWUSR 0000200 /* W for owner */ ++#endif /* DB_WIN32 */ ++#endif ++#ifndef S_IRGRP ++#ifdef DB_WIN32 ++#define S_IRGRP 0 /* R for group */ ++#else + #define S_IRGRP 0000040 /* R for group */ ++#endif /* DB_WIN32 */ ++#endif ++#ifndef S_IWGRP ++#ifdef DB_WIN32 ++#define S_IWGRP 0 /* W for group */ ++#else + #define S_IWGRP 0000020 /* W for group */ ++#endif /* DB_WIN32 */ ++#endif ++#ifndef S_IROTH ++#ifdef DB_WIN32 ++#define S_IROTH 0 /* R for other */ ++#else + #define S_IROTH 0000004 /* R for other */ ++#endif /* DB_WIN32 */ ++#endif ++#ifndef S_IWOTH ++#ifdef DB_WIN32 ++#define S_IWOTH 0 /* W for other */ ++#else + #define S_IWOTH 0000002 /* W for other */ + #endif /* DB_WIN32 */ + #endif +--- misc/build/db-3.2.9/dist/configure.orig 2001-01-25 00:16:18.000000000 +0900 ++++ misc/build/db-3.2.9/dist/configure 2003-11-01 21:53:26.000000000 +0900 +@@ -995,6 +995,9 @@ + CPPFLAGS="-D_REENTRANT $CPPFLAGS";; + mpeix*) CPPFLAGS="-D_POSIX_SOURCE -D_SOCKET_SOURCE $CPPFLAGS" + LIBS="-lsocket -lsvipc $LIBS";; ++netbsd*) optimize_def="-O2";; ++darwin*) optimize_def="-O2" ++ CPPFLAGS="-D_REENTRANT -malign-natural -no-cpp-precomp $CPPFLAGS";; + osf*) CPPFLAGS="-D_REENTRANT $CPPFLAGS";; + *qnx) cat >> confdefs.h <<\EOF + #define HAVE_QNX 1 +@@ -1626,11 +1629,22 @@ + echo $ac_n "checking libtool configuration""... $ac_c" 1>&6 + echo "configure:1628: checking libtool configuration" >&5 + echo "$ac_t""" 1>&6 +- ${CONFIG_SHELL-/bin/sh} $srcdir/ltconfig \ +- --no-verify $srcdir/ltmain.sh \ +- --output=./libtool $host_os \ +- --disable-static \ +- || { echo "configure: error: libtool configure failed" 1>&2; exit 1; } ++ case "$host_os" in ++ cygwin* | mingw*) ++ export LN_S="cp -p"; ${CONFIG_SHELL-/bin/sh} $srcdir/ltconfig \ ++ --no-verify $srcdir/ltmain.sh \ ++ --output=./libtool $host_os \ ++ --disable-static --enable-win32-dll\ ++ || { echo "configure: error: libtool configure failed" 1>&2; exit 1; } ++ ;; ++ *) ++ ${CONFIG_SHELL-/bin/sh} $srcdir/ltconfig \ ++ --no-verify $srcdir/ltmain.sh \ ++ --output=./libtool $host_os \ ++ --disable-static \ ++ || { echo "configure: error: libtool configure failed" 1>&2; exit 1; } ++ ;; ++ esac + + SOSUFFIX=`sed -e '/^library_names_spec=/!d' -e 's/.*\.\([a-zA-Z0-9_]*\).*/\1/' ./libtool` + DEFAULT_LIB="\$(libso_target)" +@@ -1644,7 +1658,14 @@ + + INSTALLER="\$(LIBTOOL) --mode=install cp" + POSTLINK="\$(LIBTOOL) --mode=execute true" +- SOLINK="\$(LIBTOOL) --mode=link ${SAVE_CC} -avoid-version" ++case "$host_os" in ++ darwin*) ++ SOLINK="\$(LIBTOOL) --mode=link g++ -avoid-version" ++ ;; ++ *) ++ SOLINK="\$(LIBTOOL) --mode=link ${SAVE_CC} -avoid-version" ++ ;; ++esac + SOFLAGS="-rpath \$(libdir)" + o=".lo" + fi +@@ -1750,8 +1771,10 @@ + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then +- ac_cv_path_JAVACABS="$ac_dir/$ac_word" +- break ++ if test "$SOLARENV/$OUTPATH/bin" != $ac_dir; then ++ ac_cv_path_JAVACABS="$ac_dir/$ac_word" ++ break ++ fi + fi + done + IFS="$ac_save_ifs" +@@ -1761,6 +1784,7 @@ + fi + JAVACABS="$ac_cv_path_JAVACABS" + if test -n "$JAVACABS"; then ++ JAVACABS=`echo $JAVACABS|sed -e 's#^/cygdrive/\(.\)/#\1:/#'` + echo "$ac_t""$JAVACABS" 1>&6 + else + echo "$ac_t""no" 1>&6 +@@ -1781,20 +1805,53 @@ + echo "$ac_t""$JAVACABS" 1>&6 + done + JTOPDIR=`echo "$JAVACABS" | sed -e 's://*:/:g' -e 's:/[^/]*$::'` +- if test -f "$JTOPDIR/include/jni.h"; then +- CPPFLAGS="$CPPFLAGSS -I$JTOPDIR/include" +- else +- JTOPDIR=`echo "$JTOPDIR" | sed -e 's:/[^/]*$::'` +- if test -f "$JTOPDIR/include/jni.h"; then +- CPPFLAGS="$CPPFLAGS -I$JTOPDIR/include" +- else +- { echo "configure: error: cannot find java include files" 1>&2; exit 1; } +- fi +- fi ++ # [ed] 12/23/01 On OS X/darwin the java include directory is named the traditional Headers ++ # name and not include ++ # [ed] 2/28/02 Make this generic for darwin ++ case "$host_os" in ++ darwin*) ++ JFRAMEDIR=`echo "$JTOPDIR" | sed -e 's:JavaVM.framework.*$:JavaVM.framework:'` ++ echo "$JFRAMEDIR" ++ if test -f "$JFRAMEDIR/Headers/jni.h"; then ++ CPPFLAGS="$CPPFLAGS -I$JFRAMEDIR/Headers -I$JFRAMEDIR/Headers" ++ elif test -f "$JFRAMEDIR/Versions/1.3.1/Headers/jni.h"; then ++ CPPFLAGS="$CPPFLAGS -I$JFRAMEDIR/Headers -I$JFRAMEDIR/Versions/1.3.1/Headers" ++ else ++ { echo "configure: error: cannot find java include files (Darwin: $JFRAMEDIR/Versions/1.3.1/Headers/jni.h)" 1>&2; exit 1; } ++ fi ++ ;; ++ cygwin*|mingw*) ++ if test -f "$JTOPDIR/include/jni.h"; then ++ CPPFLAGS="$CPPFLAGS -I$JTOPDIR/include/win32 -I$JTOPDIR/include" ++ else ++ JTOPDIR=`echo "$JTOPDIR" | sed -e 's:/[^/]*$::'` ++ if test -f "$JTOPDIR/include/jni.h"; then ++ CPPFLAGS="$CPPFLAGS -I$JTOPDIR/include/win32 -I$JTOPDIR/include" ++ else ++ { echo "configure: error: cannot find java include files" 1>&2; exit 1; } ++ fi ++ fi ++ ;; ++ *) ++ if test -f "$JTOPDIR/include/jni.h"; then ++ CPPFLAGS="$CPPFLAGS -I$JTOPDIR/include" ++ else ++ JTOPDIR=`echo "$JTOPDIR" | sed -e 's:/[^/]*$::'` ++ if test -f "$JTOPDIR/include/jni.h"; then ++ CPPFLAGS="$CPPFLAGS -I$JTOPDIR/include" ++ else ++ { echo "configure: error: cannot find java include files" 1>&2; exit 1; } ++ fi ++ fi ++ ;; ++ esac + + case "$host_os" in + solaris*) JINCSUBDIRS="solaris";; + linux*) JINCSUBDIRS="linux genunix";; ++ irix*) JINCSUBDIRS="irix";; ++ freebsd*) JINCSUBDIRS="freebsd bsd linux genunix";; ++ netbsd*) JINCSUBDIRS="netbsd linux solaris genunix";; + *) JINCSUBDIRS="genunix";; + esac + +@@ -2134,6 +2191,45 @@ + DBS_LIBS=-lpthread + else + echo "$ac_t""no" 1>&6 ++echo $ac_n "checking for pthread_create in -lpthreadGCE""... $ac_c" 1>&6 ++echo "configure:2101: checking for pthread_create in -lpthreadGCE" >&5 ++ac_lib_var=`echo pthreadGCE'_'pthread_create | sed 'y%./+-%__p_%'` ++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else ++ ac_save_LIBS="$LIBS" ++LIBS="-lpthreadGCE $LIBS" ++cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=no" ++fi ++rm -f conftest* ++LIBS="$ac_save_LIBS" ++ ++fi ++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then ++ echo "$ac_t""yes" 1>&6 ++ DBS_LIBS=-lpthreadGCE ++else ++ echo "$ac_t""no" 1>&6 ++fi + fi + + +@@ -4008,7 +4104,7 @@ + #line 4009 "configure" + #include "confdefs.h" + main(){ +-#if defined(__powerpc__) ++#if defined(__powerpc__) || defined(__ppc__) + #if defined(__GNUC__) + exit(0); + #endif +@@ -4624,6 +4720,64 @@ + fi + done + ++case "$host_os" in ++cygwin*|mingw*) ++for ac_func in select ++do ++echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 ++echo "configure:4631: checking for $ac_func" >&5 ++if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else ++ cat > conftest.$ac_ext < ++/* Override any gcc2 internal prototype to avoid an error. */ ++/* We use char because int might match the return type of a gcc2 ++ builtin and then its argument prototype would still apply. */ ++char $ac_func(); ++ ++int main() { ++ ++/* The GNU C library defines this for functions which it implements ++ to always fail with ENOSYS. Some functions are actually named ++ something starting with __ and the normal name is an alias. */ ++#if defined (__stub_$ac_func) || defined (__stub___$ac_func) ++choke me ++#else ++$ac_func(); ++#endif ++ ++; return 0; } ++EOF ++if { (eval echo configure:4659: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_func_$ac_func=yes" ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -rf conftest* ++ eval "ac_cv_func_$ac_func=no" ++fi ++rm -f conftest* ++fi ++ ++if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then ++ echo "$ac_t""yes" 1>&6 ++ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` ++ cat >> confdefs.h <&6 ++fi ++done ++;; ++*) + for ac_func in select + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +@@ -4679,6 +4833,8 @@ + { echo "configure: error: No select library function." 1>&2; exit 1; } + fi + done ++;; ++esac + + + echo $ac_n "checking for int type sprintf return value""... $ac_c" 1>&6 +@@ -5375,8 +5531,6 @@ + fi + fi + +- +- + CREATE_LIST="Makefile + include.tcl:../test/include.tcl + db.h:../include/db.src +--- misc/build/db-3.2.9/os/os_fsync.c.orig 2000-04-07 05:33:30.000000000 +0900 ++++ misc/build/db-3.2.9/os/os_fsync.c 2003-11-02 01:32:04.000000000 +0900 +@@ -22,6 +22,12 @@ + #include "db_int.h" + #include "os_jump.h" + ++#ifdef __MINGW32__ ++#include ++ ++#define fsync(fd) _commit(fd) ++#endif ++ + #ifdef HAVE_VXWORKS + #include "ioLib.h" + +--- misc/build/db-3.2.9/os/os_sleep.c.orig 2000-04-07 23:43:26.000000000 +0900 ++++ misc/build/db-3.2.9/os/os_sleep.c 2003-11-02 01:04:42.000000000 +0900 +@@ -38,6 +38,10 @@ + #include + #endif + ++#ifdef __MINGW32__ ++#include ++#endif ++ + #include "db_int.h" + #include "os_jump.h" + +@@ -68,10 +72,15 @@ + */ + t.tv_sec = secs; + t.tv_usec = usecs; ++#ifdef __MINGW32__ ++ Sleep(secs * 1000 + usecs / 1000); ++ return (0); ++#else + ret = select(0, NULL, NULL, NULL, &t) == -1 ? __os_get_errno() : 0; + + if (ret != 0) + __db_err(dbenv, "select: %s", strerror(ret)); + + return (ret); ++#endif + } +--- misc/build/db-3.2.9/dist/ltconfig.orig 2000-10-14 05:23:00.000000000 +0900 ++++ misc/build/db-3.2.9/dist/ltconfig 2003-11-02 08:25:46.000000000 +0900 +@@ -678,6 +678,11 @@ + cygwin* | mingw* | os2*) + # We can build DLLs from non-PIC. + ;; ++ darwin* | rhapsody*) ++ # PIC is the default on this platform ++ # Common symbols not allowed in MH_DYLIB files ++ pic_flag='-fno-common' ++ ;; + amigaos*) + # FIXME: we need at least 68020 code to build shared libraries, but + # adding the `-m68020' flag to GCC prevents building anything better, +@@ -1194,11 +1199,23 @@ + + netbsd*) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then ++ archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib' ++ # can we support soname and/or expsyms with a.out? -oliva ++ else + archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' +- else ++ need_version=no ++ fi ++ ;; ++ ++ freebsd*) ++ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib' + # can we support soname and/or expsyms with a.out? -oliva ++ else ++ archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib' ++ archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ need_version=no + fi + ;; + +@@ -1329,6 +1346,7 @@ + # no search path for DLLs. + hardcode_libdir_flag_spec=' ' + allow_undefined_flag=unsupported ++ no_undefined_flag=yes + # Tell ltmain to make .lib files, not .a files. + libext=lib + # FIXME: Setting linknames here is a bad hack. +@@ -1371,6 +1389,23 @@ + hardcode_shlibpath_var=no + ;; + ++ darwin* | rhapsody*) ++ case "$host_os" in ++ rhapsody* | darwin1.[012]) ++ allow_undefined_flag='-undefined suppress' ++ ;; ++ *) # Darwin 1.3 on ++ allow_undefined_flag='-undefined error' ++ ;; ++ esac ++ archive_cmds='$nonopt $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag $SOLARLIB -lstlport_gcc -o $lib $libobjs $deplibs $linkopts -install_name $rpath/$soname $verstring' ++ # We need to add '_' to the symbols in $export_symbols first ++ #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols $lib' ++ hardcode_direct=yes ++ hardcode_shlibpath_var=no ++ whole_archive_flag_spec='-all_load $convenience' ++ ;; ++ + hpux9* | hpux10* | hpux11*) + case "$host_os" in + hpux9*) archive_cmds='$rm $objdir/$soname~$LD -b +b $install_libdir -o $objdir/$soname $libobjs $deplibs $linkopts~test $objdir/$soname = $lib || mv $objdir/$soname $lib' ;; +@@ -1443,13 +1478,7 @@ + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_separator=: + ;; +- rhapsody*) +- archive_cmds='$CC -bundle -undefined suppress -o $lib $libobjs $deplibs $linkopts' +- hardcode_libdir_flags_spec='-L$libdir' +- hardcode_direct=yes +- hardcode_shlibpath_var=no +- ;; +- ++ + sco3.2v5*) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts' + hardcode_shlibpath_var=no +@@ -1919,6 +1948,27 @@ + esac + ;; + ++darwin* | rhapsody*) ++ dynamic_linker="$host_os dyld" ++ version_type=darwin ++ need_lib_prefix=no ++ need_version=no ++ deplibs_check_method='file_magic Mach-O dynamically linked shared library' ++ file_magic_cmd='/usr/bin/file -L' ++ case "$host_os" in ++ rhapsody* | darwin1.[012]) ++ file_magic_test_file='/System/Library/Frameworks/System.framework/System' ++ ;; ++ *) # Darwin 1.3 on ++ file_magic_test_file='/usr/lib/libSystem.dylib' ++ ;; ++ esac ++ library_names_spec='${libname}${release}${versuffix}.$(test .$module = .yes && echo so || echo dylib) ${libname}${release}${major}.$(test .$module = .yes && echo so || echo dylib) ${libname}.$(test .$module = .yes && echo so || echo dylib)' ++ soname_spec='${libname}${release}${major}.$(test .$module = .yes && echo so || echo dylib)' ++ shlibpath_overrides_runpath=yes ++ shlibpath_var=DYLD_LIBRARY_PATH ++ ;; ++ + gnu*) + version_type=linux + need_lib_prefix=no +@@ -1955,7 +2005,7 @@ + version_type=irix + need_lib_prefix=no + need_version=no +- soname_spec='${libname}${release}.so.$major' ++ soname_spec='${libname}${release}.so' + library_names_spec='${libname}${release}.so.$versuffix ${libname}${release}.so.$major ${libname}${release}.so $libname.so' + case "$host_os" in + irix5*) +@@ -2023,6 +2073,20 @@ + shlibpath_var=LD_LIBRARY_PATH + ;; + ++freebsd*) ++ version_type=sunos ++ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then ++ library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix' ++ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' ++ dynamic_linker='FreeBSD (a.out) ld.so' ++ else ++ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so' ++ soname_spec='${libname}${release}.so$major' ++ dynamic_linker='FreeBSD ld.elf_so' ++ fi ++ shlibpath_var=LD_LIBRARY_PATH ++ ;; ++ + openbsd*) + version_type=sunos + if test "$with_gnu_ld" = yes; then +@@ -2057,14 +2121,6 @@ + sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" + ;; + +-rhapsody*) +- version_type=sunos +- library_names_spec='${libname}.so' +- soname_spec='${libname}.so' +- shlibpath_var=DYLD_LIBRARY_PATH +- deplibs_check_method=pass_all +- ;; +- + sco3.2v5*) + version_type=osf + soname_spec='${libname}${release}.so$major' +--- misc/build/db-3.2.9/dist/ltmain.sh.orig 2000-08-07 03:32:00.000000000 +0900 ++++ misc/build/db-3.2.9/dist/ltmain.sh 2003-11-02 13:24:08.000000000 +0900 +@@ -622,7 +622,7 @@ + link) + modename="$modename: link" + case "$host" in +- *-*-cygwin* | *-*-mingw* | *-*-os2*) ++ *cygwin* | *-*-mingw* | *-*-os2*) + # It is impossible to link a dll without this setting, and + # we shouldn't force the makefile maintainer to figure out + # which system we are compiling for in order to pass an extra +@@ -880,9 +880,6 @@ + esac + done + +- # See if our shared archives depend on static archives. +- test -n "$old_archive_from_new_cmds" && build_old_libs=yes +- + # Go through the arguments, transforming them on the way. + while test $# -gt 0; do + arg="$1" +@@ -1061,7 +1058,7 @@ + *) lib_search_path="$lib_search_path $dir";; + esac + case "$host" in +- *-*-cygwin* | *-*-mingw* | *-*-os2*) ++ *cygwin* | *-*-mingw* | *-*-os2*) + dllsearchdir=`cd "$dir" && pwd || echo "$dir"` + case ":$dllsearchpath:" in + ::) dllsearchpath="$dllsearchdir";; +@@ -1075,17 +1072,27 @@ + -l*) + if test "$arg" = "-lc"; then + case "$host" in +- *-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*) ++ *cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*) + # These systems don't actually have c library (as such) + continue + ;; ++ *-*-rhapsody* | *-*-darwin1.[012]) ++ # Rhapsody C library is in the System framework ++ deplibs="$deplibs -framework System" ++ continue ++ ;; + esac + elif test "$arg" = "-lm"; then + case "$host" in +- *-*-cygwin* | *-*-beos*) ++ *cygwin* | *-*-beos*) + # These systems don't actually have math library (as such) + continue + ;; ++ *-*-rhapsody* | *-*-darwin1.[012]) ++ # Rhapsody math library is in the System framework ++ deplibs="$deplibs -framework System" ++ continue ++ ;; + esac + fi + deplibs="$deplibs $arg" +@@ -1362,7 +1369,7 @@ + compile_command="$compile_command $dir/$linklib" + deplibs="$deplibs $dir/$linklib" + case "$host" in +- *-*-cygwin* | *-*-mingw* | *-*-os2*) ++ *cygwin* | *-*-mingw* | *-*-os2*) + dllsearchdir=`cd "$dir" && pwd || echo "$dir"` + if test -n "$dllsearchpath"; then + dllsearchpath="$dllsearchpath:$dllsearchdir" +@@ -1569,6 +1576,9 @@ + ;; + + *.la) ++ # See if our shared archives depend on static archives. ++ test -n "$old_archive_from_new_cmds" && build_old_libs=yes ++ + # Make sure we only generate libraries of the form `libNAME.la'. + case "$outputname" in + lib*) +@@ -1753,6 +1763,16 @@ + versuffix="-$major-$age-$revision" + ;; + ++ darwin) ++ # Like Linux, but with the current version available in ++ # verstring for coding it into the library header ++ major=.`expr $current - $age` ++ versuffix="$major.$age.$revision" ++ # Darwin ld doesn't like 0 for these options... ++ minor_current=`expr $current + 1` ++ verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" ++ ;; ++ + *) + $echo "$modename: unknown library version type \`$version_type'" 1>&2 + echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 +@@ -1763,7 +1783,16 @@ + # Clear the version info if we defaulted, and they specified a release. + if test -z "$vinfo" && test -n "$release"; then + major= +- verstring="0.0" ++ case "$version_type" in ++ darwin) ++ # we can't check for "0.0" in archive_cmds due to quoting ++ # problems, so we reset it completely ++ verstring="" ++ ;; ++ *) ++ verstring="0.0" ++ ;; ++ esac + if test "$need_version" = no; then + versuffix= + else +@@ -1792,7 +1821,7 @@ + + dependency_libs="$deplibs" + case "$host" in +- *-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*) ++ *cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*) + # these systems don't actually have a c library (as such)! + ;; + +@@ -1803,6 +1832,11 @@ + # defer to whether the user wants -lc, or -lc_r + ;; + ++ *-*-rhapsody* | *-*-darwin1.[012]) ++ # Rhapsody C library is in the System framework ++ deplibs="$deplibs -framework System" ++ ;; ++ + *) + # Add libc to deplibs on all other systems. + deplibs="$deplibs -lc" +@@ -2627,7 +2661,7 @@ + # linked before any other PIC object. But we must not use + # pic_flag when linking with -static. The problem exists in + # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1. +- *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) ++ *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) + case "$compile_command " in + *" -static "*) ;; + *) pic_flag_for_symtable=" $pic_flag -DPIC -DFREEBSD_WORKAROUND";; +@@ -2865,9 +2899,21 @@ + " + + if test "$fast_install" = yes; then +- echo >> $output "\ +- program=lt-'$outputname' ++ case $host in ++ *cygwin*) ++ echo >> $output "\ ++ program=lt-'$outputname'\"$exeext\" ++ progdir=\`cygpath -m \"\$thisdir/$objdir\"\` ++" ++ ;; ++ *) ++ echo >> $output "\ ++ program=lt-'$outputname'\"$exeext\" + progdir=\"\$thisdir/$objdir\" ++" ++ ;; ++ esac ++ echo >> $output "\ + + if test ! -f \"\$progdir/\$program\" || \\ + { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | sed 1q\`; \\ +@@ -2898,10 +2944,21 @@ + $rm \"\$progdir/\$file\" + fi" + else +- echo >> $output "\ +- program='$outputname' ++ case $host in ++ *cygwin*) ++ echo >> $output "\ ++ program='$outputname'\"$exeext\" + progdir=\"\$thisdir/$objdir\" ++ progdir=\`cygpath -m \"\$thisdir/$objdir\"\` + " ++ ;; ++ *) ++ echo >> $output "\ ++ program='$outputname'\"$exeext\" ++ progdir=\"\$thisdir/$objdir\" ++" ++ ;; ++ esac + fi + + echo >> $output "\ +@@ -2937,7 +2994,7 @@ + case $host in + # win32 systems need to use the prog path for dll + # lookup to work +- *-*-cygwin*) ++ *cygwin*) + $echo >> $output "\ + exec \$progdir/\$program \${1+\"\$@\"} + " --- ./testtools/prj/d.lst.orig 2001-05-04 16:05:18.000000000 +0900 +++ ./testtools/prj/d.lst 2004-01-13 23:21:22.000000000 +0900 @@ -1,2 +1,3 @@ ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\* ..\%__SRC%\lib\*.so %_DEST%\lib%_EXT%\* +..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\* --- ./padmin/prj/d.lst.orig 2002-08-28 21:39:28.000000000 +0900 +++ ./padmin/prj/d.lst 2004-01-13 23:12:28.000000000 +0900 @@ -1,4 +1,5 @@ ..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*.res ..\%__SRC%\bin\*.bin %_DEST%\bin%_EXT%\*.bin ..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%\lib*.so +..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT%\lib*.a ..\%__SRC%\lib\lib*.dylib %_DEST%\lib%_EXT%\lib*.dylib --- ./psprint/util/libpsp_mingw.map.orig 2002-08-02 21:10:14.000000000 +0900 +++ ./psprint/util/libpsp_mingw.map 2004-01-12 12:35:06.000000000 +0900 @@ -1,5 +1,5 @@ { - local: + global: AddTable; CloseTTFont; cmapAdd; --- ./psprint/prj/d.lst.orig 2003-06-02 18:17:12.000000000 +0900 +++ ./psprint/prj/d.lst 2004-01-17 14:45:22.000000000 +0900 @@ -1,6 +1,8 @@ mkdir: %_DEST%\inc%_EXT%\psprint +..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll ..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT% +..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT% ..\%__SRC%\slb\apsp.lib %_DEST%\lib%_EXT%\apsp.lib ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib --- ./shell/source/win32/simplemail/simplemapi.hxx.orig 2001-05-14 17:09:22.000000000 +0900 +++ ./shell/source/win32/simplemail/simplemapi.hxx 2004-01-11 20:48:48.000000000 +0900 @@ -70,7 +70,10 @@ #include #include +#ifdef __MINGW32__ +#else #include +#endif //---------------------------------------------------------- // class declaration --- ./shell/source/win32/simplemail/smplmailclient.cxx.orig 2003-03-27 20:16:20.000000000 +0900 +++ ./shell/source/win32/simplemail/smplmailclient.cxx 2004-01-11 20:57:26.000000000 +0900 @@ -446,7 +446,11 @@ osl::FileBase::getSystemPathFromFileURL( aAttachementList[i], aSysPath ); +#ifdef __MINGW32__ + if ( osl::FileBase::E_None != rc ) +#else if ( osl::FileBase::RC::E_None != rc ) +#endif throw IllegalArgumentException( OUString::createFromAscii( " " ), static_cast< XSimpleMailClient* >( this ), --- ./shell/source/win32/shlxthandler/classfactory.cxx.orig 2002-08-26 19:53:56.000000000 +0900 +++ ./shell/source/win32/shlxthandler/classfactory.cxx 2004-01-07 23:11:00.000000000 +0900 @@ -67,6 +67,10 @@ #include "classfactory.hxx" #endif +#ifndef _SHLXTHDL_HXX_ +#include "shlxthdl.hxx" +#endif + #ifndef _INFOTIP_HXX_ #include "infotip.hxx" #endif @@ -79,10 +83,6 @@ #include "columnprovider.hxx" #endif -#ifndef _SHLXTHDL_HXX_ -#include "shlxthdl.hxx" -#endif - //----------------------------- // //----------------------------- --- ./shell/source/win32/shlxthandler/classfactory.hxx.orig 2002-08-26 19:53:44.000000000 +0900 +++ ./shell/source/win32/shlxthandler/classfactory.hxx 2004-01-07 00:59:24.000000000 +0900 @@ -62,6 +62,10 @@ #ifndef _CLASSFACTORY_HXX_ #define _CLASSFACTORY_HXX_ +#ifdef __MINGW32__ +#include +#include +#endif #include class CClassFactory : public IClassFactory --- ./shell/source/win32/shlxthandler/zipexcptn.hxx.orig 2002-08-26 19:53:44.000000000 +0900 +++ ./shell/source/win32/shlxthandler/zipexcptn.hxx 2004-01-07 01:25:22.000000000 +0900 @@ -14,7 +14,7 @@ { public: RuntimeException(int Error); - virtual ~RuntimeException(); + virtual ~RuntimeException() throw(); int GetErrorCode() const; @@ -40,7 +40,7 @@ { public: Win32Exception(int Error); - virtual ~Win32Exception(); + virtual ~Win32Exception() throw(); virtual const char* what() const throw(); --- ./shell/source/win32/shlxthandler/infotip.hxx.orig 2002-08-26 19:53:40.000000000 +0900 +++ ./shell/source/win32/shlxthandler/infotip.hxx 2004-01-10 13:33:54.000000000 +0900 @@ -62,6 +62,10 @@ #ifndef _INFOTIP_HXX_ #define _INFOTIP_HXX_ +#ifdef __MINGW32__ +#include +#include +#endif #include #include #include --- ./shell/source/win32/shlxthandler/zipexcptn.cxx.orig 2002-08-26 19:54:02.000000000 +0900 +++ ./shell/source/win32/shlxthandler/zipexcptn.cxx 2004-01-08 02:15:46.000000000 +0900 @@ -78,7 +78,7 @@ //------------------------------------------ /** */ -RuntimeException::~RuntimeException() +RuntimeException::~RuntimeException() throw() { } @@ -118,7 +118,7 @@ //------------------------------------------ /** */ -Win32Exception::~Win32Exception() +Win32Exception::~Win32Exception() throw() { if (m_MsgBuff) LocalFree(m_MsgBuff); --- ./shell/source/win32/shlxthandler/types.hxx.orig 2002-08-26 19:53:40.000000000 +0900 +++ ./shell/source/win32/shlxthandler/types.hxx 2004-01-08 02:05:52.000000000 +0900 @@ -74,6 +74,6 @@ typedef std::pair XmlTag_t; typedef std::map XmlTags_t; -#define EMPTY_XML_TAG std::make_pair(std::wstring(), XmlTagAttributes_t()) +#define EMPTY_XML_TAG std::make_pair(Characters_t(), XmlTagAttributes_t()) #endif --- ./shell/source/win32/shlxthandler/xmlprsr.cxx.orig 2002-08-26 19:53:56.000000000 +0900 +++ ./shell/source/win32/shlxthandler/xmlprsr.cxx 2004-01-08 02:13:46.000000000 +0900 @@ -287,7 +287,7 @@ while(atts[i]) { - xml_attribs[GetLocalName(atts[i])] = atts[i+1]; + xml_attribs[GetLocalName(reinterpret_cast< LPCWSTR >(atts[i]))] = reinterpret_cast< LPCWSTR >(atts[i+1]); i += 2; // skip to next pair } @@ -322,7 +322,7 @@ SaxParser* pImpl = reinterpret_cast(XML_GetUserData(parser)); if (pImpl->m_SaxDocumentHandler) - pImpl->m_SaxDocumentHandler->Characters(std::wstring(s, len)); + pImpl->m_SaxDocumentHandler->Characters(std::wstring(reinterpret_cast< LPCWSTR >(s), len)); } //--------------------------------- --- ./shell/source/win32/shlxthandler/infotip.cxx.orig 2002-08-26 19:53:56.000000000 +0900 +++ ./shell/source/win32/shlxthandler/infotip.cxx 2004-01-10 13:41:34.000000000 +0900 @@ -85,6 +85,12 @@ #include "resource.h" +#ifdef __MINGW32__ +#define INITGUID +#include +DEFINE_GUID(IID_IQueryInfo,0x00021500,0,0,0xc0,0,0,0,0,0,0,0x46); +#endif + //----------------------------- // //----------------------------- --- ./shell/source/tools/lngconvex/lngconvex.cxx.orig 2003-06-20 19:36:54.000000000 +0900 +++ ./shell/source/tools/lngconvex/lngconvex.cxx 2004-01-12 01:05:38.000000000 +0900 @@ -1,4 +1,4 @@ -// Test_Stl_Stream.cpp : Definiert den Einsprungpunkt für die Konsolenanwendung. +// Test_Stl_Stream.cpp : Definiert den Einsprungpunkt f die Konsolenanwendung. // //#define WIN32_LEAN_AND_MEAN @@ -655,7 +655,7 @@ for (/**/ ;rct_iter != rct_iter_end; ++rct_iter) { - std::istringstream iss = rct_iter->m_Line; + std::istringstream iss(rct_iter->m_Line); std::string line; while (iss) @@ -732,10 +732,13 @@ rtl::OUString oustr_abs_name = GetAbsoluteDirectory( module_dir, OStr2OUStr(cmdline.GetArgument("-c").c_str())); + { + std::ifstream temp(OUStr2OStr(oustr_abs_name).getStr()); ReadCtryLngFile( - std::ifstream(OUStr2OStr(oustr_abs_name).getStr()), + temp, substitutor, g_country_lng_file_countries); + } oustr_abs_name = GetAbsoluteDirectory( module_dir, OStr2OUStr(cmdline.GetArgument("-lng").c_str())); @@ -765,9 +768,12 @@ oustr_abs_name = GetAbsoluteDirectory( module_dir, OStr2OUStr(cmdline.GetArgument("-rch").c_str())); + { + std::ifstream temp(OUStr2OStr(oustr_abs_name).getStr()); FileAppendRcHeader( rc_output_file, - std::ifstream(OUStr2OStr(oustr_abs_name).getStr())); + temp); + } InflateRcTemplateAndAppendToFile( rc_output_file, @@ -778,9 +784,12 @@ oustr_abs_name = GetAbsoluteDirectory( module_dir, OStr2OUStr(cmdline.GetArgument("-rcf").c_str())); + { + std::ifstream temp(OUStr2OStr(oustr_abs_name).getStr()); FileAppendRcFooter( rc_output_file, - std::ifstream(OUStr2OStr(oustr_abs_name).getStr())); + temp); + } } catch(const std::ios::failure& ex) --- ./soltools/ldump/ldump.cxx.orig 2003-03-18 21:47:36.000000000 +0900 +++ ./soltools/ldump/ldump.cxx 2003-10-08 23:35:56.000000000 +0900 @@ -628,7 +628,7 @@ *********************************************************************/ -usage() +int usage() { LibDump::DumpError(99); exit(0); --- ./soltools/ldump/hashtbl.cxx.orig 2001-04-11 18:52:26.000000000 +0900 +++ ./soltools/ldump/hashtbl.cxx 2003-10-08 23:38:16.000000000 +0900 @@ -125,8 +125,8 @@ HashTable::~HashTable() { // Wenn die HashTable der Owner der Objecte ist, - // müssen die Destruktoren separat gerufen werden. - // Dies geschieht über die virtuelle Methode OnDeleteObject() + // msen die Destruktoren separat gerufen werden. + // Dies geschieht er die virtuelle Methode OnDeleteObject() // // Problem: Virtuelle Funktionen sind im Destructor nicht virtuell!! // Der Code muß deshalb ins Macro @@ -144,12 +144,12 @@ } */ - // Speicher für HashItems freigeben + // Speicher f HashItems freigeben delete [] m_pData; } void* HashTable::GetObjectAt(unsigned long lPos) const -// Gibt Objekt zurück, wenn es eines gibt, sonst NULL; +// Gibt Objekt zurk, wenn es eines gibt, sonst NULL; { HashItem *pItem = &m_pData[lPos]; @@ -198,7 +198,7 @@ } unsigned long HashTable::Probe(unsigned long lPos) const -// gibt den Folgewert von lPos zurück +// gibt den Folgewert von lPos zurk { lPos++; if (lPos==m_lSize) lPos=0; return lPos; @@ -212,7 +212,7 @@ bool HashTable::Insert(const char * Key, void* pObject) // pre: Key ist nicht im Dictionary enthalten, sonst return FALSE // Dictionary ist nicht voll, sonst return FALSE -// post: pObject ist unter Key im Dictionary; m_nElem wurde erhöht +// post: pObject ist unter Key im Dictionary; m_nElem wurde erh t { SmartGrow(); @@ -266,7 +266,7 @@ HashItem* HashTable::FindPos(const char * Key) const // sucht den Key; gibt Refrenz auf den Eintrag (gefunden) -// oder NULL (nicht gefunden) zurück +// oder NULL (nicht gefunden) zurk // // pre: - // post: - @@ -326,7 +326,7 @@ } void* HashTable::Find(const char *Key) const -// Gibt Verweis des Objektes zurück, das unter Key abgespeichert ist, +// Gibt Verweis des Objektes zurk, das unter Key abgespeichert ist, // oder NULL wenn nicht vorhanden. // // pre: - @@ -342,13 +342,13 @@ } void* HashTable::Delete( const char * Key) -// Löscht Objekt, das unter Key abgespeichert ist und gibt Verweis -// darauf zurück. -// Gibt NULL zurück, wenn Key nicht vorhanden ist. +// L cht Objekt, das unter Key abgespeichert ist und gibt Verweis +// darauf zurk. +// Gibt NULL zurk, wenn Key nicht vorhanden ist. // // pre: - // post: Objekt ist nicht mehr enthalten; m_lElem dekrementiert -// Wenn die HashTable der Owner ist, wurde das Object gelöscht +// Wenn die HashTable der Owner ist, wurde das Object gel cht { HashItem *pItem = FindPos(Key); @@ -388,7 +388,7 @@ unsigned long lOldSize = m_lSize; // alte Daten sichern HashItem* pOldData = m_pData; - m_lSize = unsigned long (m_dGrowFactor * m_lSize); // neue Größe + m_lSize = (unsigned long) (m_dGrowFactor * m_lSize); // neue Gr e m_pData = new HashItem[m_lSize]; // neue Daten holen // kein Speicher: --- ./idlc/source/astexpression.cxx.orig 2001-03-15 21:30:44.000000000 +0900 +++ ./idlc/source/astexpression.cxx 2003-12-14 19:19:40.000000000 +0900 @@ -79,9 +79,15 @@ #undef MINCHAR #define MINCHAR -128 +#ifdef __MINGW32__ +#define MAXINT64 9223372036854775807LL +#define MININT64 -9223372036854775807LL-1 +#define MAXUINT64 18446744073709551615ULL +#else #define MAXINT64 9223372036854775807 #define MININT64 -9223372036854775807-1 #define MAXUINT64 18446744073709551615 +#endif using namespace ::rtl; --- ./idlc/source/parser.y.orig 2003-03-26 21:11:10.000000000 +0900 +++ ./idlc/source/parser.y 2003-12-14 19:38:56.000000000 +0900 @@ -144,6 +144,7 @@ return res; } +#if defined (_MSC_VER) && (_MSC_VER < 1310) void* malloc( size_t size ) { return ::malloc(size); @@ -153,6 +154,7 @@ { ::free(memblock); } +#endif }; #endif --- ./xmlscript/prj/d.lst.orig 2003-05-14 01:11:18.000000000 +0900 +++ ./xmlscript/prj/d.lst 2004-01-13 23:22:42.000000000 +0900 @@ -2,6 +2,7 @@ ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll ..\%__SRC%\lib\*.lib %_DEST%\lib%_EXT%\*.lib ..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%\lib*.so +..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT%\lib*.a ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib ..\inc\xmlscript\xml_helper.hxx %_DEST%\inc%_EXT%\xmlscript\xml_helper.hxx --- ./dtrans/source/win32/mtaole/MtaOleClipb.cxx.orig 2003-05-22 19:23:18.000000000 +0900 +++ ./dtrans/source/win32/mtaole/MtaOleClipb.cxx 2004-01-04 10:48:24.000000000 +0900 @@ -89,7 +89,7 @@ #include #include -#include +#include "..\..\inc\common.hxx" //---------------------------------------------------------------- // namespace directives @@ -699,7 +699,11 @@ { LRESULT lResult = 0; +#ifdef __MINGW32__ + try +#else __try +#endif { // get a connection to the class-instance via the static member CMtaOleClipboard* pImpl = CMtaOleClipboard::s_theMtaOleClipboardInst; @@ -777,7 +781,11 @@ break; } } +#ifdef __MINGW32__ + catch(...) +#else __except( EXCEPTION_EXECUTE_HANDLER ) +#endif { OSL_ENSURE( sal_False, "Kernel exception in window-proc caught!" ); } --- ./dtrans/source/win32/misc/ImplHelper.cxx.orig 2002-08-14 23:48:26.000000000 +0900 +++ ./dtrans/source/win32/misc/ImplHelper.cxx 2004-01-04 08:42:44.000000000 +0900 @@ -144,17 +144,29 @@ OUString winCP; // set an default value +#ifdef __MINGW32__ + wchar_t wcstr[10]; +#else sal_Unicode wcstr[10]; +#endif if ( LOCALE_IDEFAULTCODEPAGE == lctype ) { _itow( GetOEMCP( ), wcstr, 10 ); +#ifdef __MINGW32__ + winCP = OUString( reinterpret_cast< sal_Unicode * >( wcstr ), wcslen( wcstr ) ); +#else winCP = OUString( wcstr, wcslen( wcstr ) ); +#endif } else if ( LOCALE_IDEFAULTANSICODEPAGE == lctype ) { _itow( GetACP( ), wcstr, 10 ); +#ifdef __MINGW32__ + winCP = OUString( reinterpret_cast< sal_Unicode * >( wcstr ), wcslen( wcstr ) ); +#else winCP = OUString( wcstr, wcslen( wcstr ) ); +#endif } else OSL_ASSERT( sal_False ); @@ -179,8 +191,11 @@ if ( NULL != lpwchBuff.get( ) ) { len = MultiByteToWideChar( +#ifdef __MINGW32__ + CP_ACP, 0, buff, -1, reinterpret_cast< wchar_t * >( lpwchBuff.get( ) ), len ); +#else CP_ACP, 0, buff, -1, lpwchBuff.get( ), len ); - +#endif winCP = OUString( lpwchBuff.get( ), (len - 1) ); } } @@ -239,9 +254,15 @@ { OSL_ASSERT( IsValidCodePage( codepage ) ); +#ifdef __MINGW32__ + wchar_t cpStr[6]; + _itow( codepage, cpStr, 10 ); + return OUString( reinterpret_cast< sal_Unicode * >( cpStr ), wcslen( cpStr ) ); +#else sal_Unicode cpStr[6]; _itow( codepage, cpStr, 10 ); return OUString( cpStr, wcslen( cpStr ) ); +#endif } //------------------------------------------------------------------------- @@ -257,11 +278,19 @@ void SAL_CALL DeleteTargetDevice( DVTARGETDEVICE* ptd ) { +#ifdef __MINGW32__ + try +#else __try +#endif { CoTaskMemFree( ptd ); } +#ifdef __MINGW32__ + catch(...) +#else __except( EXCEPTION_EXECUTE_HANDLER ) +#endif { OSL_ENSURE( sal_False, "Error DeleteTargetDevice" ); } @@ -291,7 +320,11 @@ { DVTARGETDEVICE* ptdDest = NULL; +#ifdef __MINGW32__ + try +#else __try +#endif { if ( NULL != ptdSrc ) { @@ -299,7 +332,11 @@ rtl_copyMemory( ptdDest, ptdSrc, static_cast< size_t >( ptdSrc->tdSize ) ); } } +#ifdef __MINGW32__ + catch(...) +#else __except( EXCEPTION_EXECUTE_HANDLER ) +#endif { } @@ -337,10 +374,14 @@ { sal_Bool bRet = sal_False; +#ifdef __MINGW32__ + try +#else __try +#endif { - if ( petcDest == petcSrc ) - __leave; + if ( petcDest != petcSrc ) + { petcDest->cfFormat = petcSrc->cfFormat; @@ -353,8 +394,13 @@ petcDest->tymed = petcSrc->tymed; bRet = sal_True; + } } +#ifdef __MINGW32__ + catch(...) +#else __except( EXCEPTION_EXECUTE_HANDLER ) +#endif { OSL_ENSURE( sal_False, "Error CopyFormatEtc" ); } @@ -374,32 +420,35 @@ { sal_Int32 nMatch = FORMATETC_EXACT_MATCH; +#ifdef __MINGW32__ + try +#else __try +#endif { - if ( pFetcLhs == pFetcRhs ) - __leave; + if ( pFetcLhs != pFetcRhs ) if ( ( pFetcLhs->cfFormat != pFetcRhs->cfFormat ) || ( pFetcLhs->lindex != pFetcRhs->lindex ) || !CompareTargetDevice( pFetcLhs->ptd, pFetcRhs->ptd ) ) { nMatch = FORMATETC_NO_MATCH; - __leave; } - if ( pFetcLhs->dwAspect == pFetcRhs->dwAspect ) + else if ( pFetcLhs->dwAspect == pFetcRhs->dwAspect ) // same aspects; equal ; else if ( ( pFetcLhs->dwAspect & ~pFetcRhs->dwAspect ) != 0 ) { // left not subset of aspects of right; not equal nMatch = FORMATETC_NO_MATCH; - __leave; } else // left subset of right nMatch = FORMATETC_PARTIAL_MATCH; + if ( nMatch == FORMATETC_EXACT_MATCH || nMatch == FORMATETC_PARTIAL_MATCH ) + { if ( pFetcLhs->tymed == pFetcRhs->tymed ) // same medium flags; equal ; @@ -407,13 +456,17 @@ { // left not subset of medium flags of right; not equal nMatch = FORMATETC_NO_MATCH; - __leave; } else // left subset of right nMatch = FORMATETC_PARTIAL_MATCH; + } } +#ifdef __MINGW32__ + catch(...) +#else __except( EXCEPTION_EXECUTE_HANDLER ) +#endif { OSL_ENSURE( sal_False, "Error CompareFormatEtc" ); nMatch = FORMATETC_NO_MATCH; @@ -431,26 +484,31 @@ { sal_Bool bRet = sal_False; +#ifdef __MINGW32__ + try +#else __try +#endif { if ( ptdLeft == ptdRight ) { // same address of td; must be same (handles NULL case) bRet = sal_True; - __leave; } // one ot the two is NULL - if ( ( NULL == ptdRight ) || ( NULL == ptdLeft ) ) - __leave; + else if ( ( NULL != ptdRight ) && ( NULL != ptdLeft ) ) - if ( ptdLeft->tdSize != ptdRight->tdSize ) - __leave; + if ( ptdLeft->tdSize == ptdRight->tdSize ) if ( rtl_compareMemory( ptdLeft, ptdRight, ptdLeft->tdSize ) == 0 ) bRet = sal_True; } +#ifdef __MINGW32__ + catch(...) +#else __except( EXCEPTION_EXECUTE_HANDLER ) +#endif { OSL_ENSURE( sal_False, "Error CompareTargetDevice" ); bRet = sal_False; --- ./dtrans/source/win32/dtobj/APNDataObject.hxx.orig 2001-02-27 16:49:58.000000000 +0900 +++ ./dtrans/source/win32/dtobj/APNDataObject.hxx 2004-01-04 13:59:40.000000000 +0900 @@ -67,7 +67,7 @@ // includes //------------------------------------------------------------------------ -#include +#include "..\..\inc\common.hxx" //------------------------------------------------------------------------ // deklarations --- ./dtrans/source/win32/dtobj/DOTransferable.cxx.orig 2003-04-24 23:55:08.000000000 +0900 +++ ./dtrans/source/win32/dtobj/DOTransferable.cxx 2004-01-04 10:14:58.000000000 +0900 @@ -108,7 +108,7 @@ #endif -#if(_MSC_VER < 1300) +#if(_MSC_VER < 1300) && !defined(__MINGW32__) #include #endif @@ -129,7 +129,7 @@ using namespace com::sun::star::io; using namespace com::sun::star::lang; using namespace com::sun::star::container; -using CStgTransferHelper::CStgTransferException; +//using CStgTransferHelper::CStgTransferException; //------------------------------------------------------------------------ // @@ -421,7 +421,7 @@ ReleaseStgMedium( &stgmedium ); } - catch( CStgTransferException& ) + catch( CStgTransferHelper::CStgTransferException& ) { ReleaseStgMedium( &stgmedium ); throw IOException( ); --- ./dtrans/source/win32/dtobj/DOTransferable.hxx.orig 2001-08-15 15:58:12.000000000 +0900 +++ ./dtrans/source/win32/dtobj/DOTransferable.hxx 2004-01-04 10:03:10.000000000 +0900 @@ -91,7 +91,7 @@ #include #endif -#include +#include "..\..\inc\common.hxx" //------------------------------------------------------------------------ // deklarations --- ./dtrans/source/win32/dtobj/DataFmtTransl.cxx.orig 2002-08-14 23:46:46.000000000 +0900 +++ ./dtrans/source/win32/dtobj/DataFmtTransl.cxx 2004-01-04 10:16:02.000000000 +0900 @@ -105,7 +105,7 @@ #include -#if (_MSC_VER < 1300) +#if (_MSC_VER < 1300) && !defined(__MINGW32__) #include #endif --- ./dtrans/source/win32/dtobj/XTDataObject.cxx.orig 2003-04-16 02:11:18.000000000 +0900 +++ ./dtrans/source/win32/dtobj/XTDataObject.cxx 2004-01-04 10:50:12.000000000 +0900 @@ -97,6 +97,7 @@ #include #include +#include "..\..\inc\common.hxx" //------------------------------------------------------------------------ // namespace directives @@ -107,7 +108,7 @@ using namespace com::sun::star::uno; using namespace com::sun::star::lang; using namespace rtl; -using CStgTransferHelper::CStgTransferException; +//using CStgTransferHelper::CStgTransferException; //------------------------------------------------------------------------ // a helper class that will be thrown by the function validateFormatEtc @@ -147,8 +148,13 @@ HRESULT hr = E_NOINTERFACE; *ppvObject = NULL; +#ifdef __MINGW32__ + if ( ( IID_IUnknown == iid ) || + ( IID_IDataObject == iid ) ) +#else if ( ( __uuidof( IUnknown ) == iid ) || ( __uuidof( IDataObject ) == iid ) ) +#endif { *ppvObject = static_cast< IUnknown* >( this ); ( (LPUNKNOWN)*ppvObject )->AddRef( ); @@ -218,7 +224,7 @@ { return ex.m_hr; } - catch( CStgTransferException& ex ) + catch( CStgTransferHelper::CStgTransferException& ex ) { return translateStgExceptionCode( ex.m_hr ); } @@ -405,7 +411,7 @@ { OSL_ENSURE( sal_False, "Unexpected exception" ); } - catch( CStgTransferException& ex ) + catch( CStgTransferHelper::CStgTransferException& ex ) { return translateStgExceptionCode( ex.m_hr ); } @@ -479,7 +485,11 @@ WideCharToMultiByteEx( GetACP( ), +#ifdef __MINGW32__ + reinterpret_cast< const wchar_t * >( const_cast< const sal_Unicode * >( aUnicodeText.getStr( ) ) ), +#else static_cast< const sal_Unicode* >( aUnicodeText.getStr( ) ), +#endif aUnicodeText.getLength( ), stgTransfHelper ); --- ./dtrans/source/win32/dtobj/XNotifyingDataObject.hxx.orig 2001-03-17 01:31:48.000000000 +0900 +++ ./dtrans/source/win32/dtobj/XNotifyingDataObject.hxx 2004-01-04 10:24:06.000000000 +0900 @@ -76,9 +76,9 @@ #include #endif -#include #include -#include +#include +#include "..\..\inc\common.hxx" /*-------------------------------------------------------------------------- To implement the lostOwnership mechanism cleanly we need this wrapper --- ./dtrans/source/win32/dnd/sourcecontext.cxx.orig 2003-04-16 02:10:36.000000000 +0900 +++ ./dtrans/source/win32/dnd/sourcecontext.cxx 2004-01-04 11:56:12.000000000 +0900 @@ -111,12 +111,12 @@ } void SAL_CALL SourceContext::setCursor( sal_Int32 cursorId ) - throw( IllegalArgumentException, RuntimeException) + throw( RuntimeException) { } void SAL_CALL SourceContext::setImage( sal_Int32 imageId ) - throw( IllegalArgumentException, RuntimeException) + throw( RuntimeException) { } --- ./dtrans/source/win32/dnd/sourcecontext.hxx.orig 2001-02-09 02:12:56.000000000 +0900 +++ ./dtrans/source/win32/dnd/sourcecontext.hxx 2004-01-04 11:39:10.000000000 +0900 @@ -110,9 +110,9 @@ virtual sal_Int32 SAL_CALL getCurrentCursor( ) throw( RuntimeException); virtual void SAL_CALL setCursor( sal_Int32 cursorId ) - throw( IllegalArgumentException, RuntimeException); + throw( RuntimeException); virtual void SAL_CALL setImage( sal_Int32 imageId ) - throw( IllegalArgumentException, RuntimeException); + throw( RuntimeException); virtual void SAL_CALL transferablesFlavorsChanged( ) throw( RuntimeException); --- ./dtrans/source/win32/dnd/source.hxx.orig 2003-04-16 02:10:26.000000000 +0900 +++ ./dtrans/source/win32/dnd/source.hxx 2004-01-04 10:36:26.000000000 +0900 @@ -83,7 +83,7 @@ #include "../../inc/DtObjFactory.hxx" #include "globals.hxx" #include -#include +#include "..\..\inc\common.hxx" using namespace ::com::sun::star::lang; --- ./dtrans/source/win32/dnd/target.hxx.orig 2003-04-16 02:10:58.000000000 +0900 +++ ./dtrans/source/win32/dnd/target.hxx 2004-01-04 10:38:10.000000000 +0900 @@ -84,6 +84,7 @@ #include #endif +#include #include #include "globals.hxx" #include "../../inc/DtObjFactory.hxx" --- ./dtrans/source/win32/dnd/source.cxx.orig 2003-04-16 02:10:16.000000000 +0900 +++ ./dtrans/source/win32/dnd/source.cxx 2004-01-04 10:51:12.000000000 +0900 @@ -83,7 +83,7 @@ #include "sourcecontext.hxx" #include "../../inc/DtObjFactory.hxx" #include -#include +#include "..\..\inc\common.hxx" #include #include #include --- ./dtrans/source/win32/clipb/WinClipbImpl.hxx.orig 2001-09-28 21:23:22.000000000 +0900 +++ ./dtrans/source/win32/clipb/WinClipbImpl.hxx 2004-01-04 09:36:42.000000000 +0900 @@ -92,7 +92,7 @@ #endif #include -#include +#include "..\..\inc\common.hxx" class CWinClipboard; class CXNotifyingDataObject; --- ./dtrans/source/inc/DtObjFactory.hxx.orig 2001-03-02 20:51:44.000000000 +0900 +++ ./dtrans/source/inc/DtObjFactory.hxx 2004-01-04 10:21:38.000000000 +0900 @@ -75,7 +75,7 @@ #include #endif -#include +#include "..\..\inc\common.hxx" //------------------------------------------------------------------------ // deklarations --- ./dtrans/source/inc/MtaOleClipb.hxx.orig 2001-08-24 16:09:46.000000000 +0900 +++ ./dtrans/source/inc/MtaOleClipb.hxx 2004-01-04 03:03:34.000000000 +0900 @@ -70,6 +70,9 @@ #include #endif +#ifdef __MINGW32__ +#include +#endif #include //-------------------------------------------------------- --- ./dtrans/prj/d.lst.orig 2003-06-02 18:00:18.000000000 +0900 +++ ./dtrans/prj/d.lst 2004-01-13 22:07:46.000000000 +0900 @@ -1,4 +1,5 @@ ..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT% +..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT% ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib --- ./odk/prj/d.lst.orig 2003-03-26 22:40:14.000000000 +0900 +++ ./odk/prj/d.lst 2004-01-13 23:05:54.000000000 +0900 @@ -9,6 +9,7 @@ ..\%__SRC%\bin\officebean.dll %_DEST%\bin%_EXT%\officebean.dll ..\%__SRC%\lib\libofficebean.so %_DEST%\lib%_EXT%\libofficebean.so +..\%__SRC%\lib\libofficebean.a %_DEST%\lib%_EXT%\libofficebean.a ..\%__SRC%\lib\*officebean.dylib %_DEST%\lib%_EXT%\*officebean.dylib dos: sh -c "if test %OS% = MACOSX; then create-bundle %_DEST%\lib%_EXT%\*.dylib; fi" --- ./package/prj/d.lst.orig 2003-05-28 00:54:30.000000000 +0900 +++ ./package/prj/d.lst 2004-01-13 23:12:00.000000000 +0900 @@ -1,5 +1,6 @@ ..\%__SRC%\misc\*.map %_DEST%\bin%_EXT%\*.map ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll ..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%\lib*.so +..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT%\lib*.a ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib ..\dtd\*.dtd %_DEST%\bin%_EXT%\*.* --- ./ucb/prj/d.lst.orig 2003-03-28 02:26:38.000000000 +0900 +++ ./ucb/prj/d.lst 2004-01-13 23:21:48.000000000 +0900 @@ -18,6 +18,7 @@ ..\%__SRC%\bin\ucp*.dll %_DEST%\bin%_EXT%\ucp*.dll ..\%__SRC%\lib\libucp*.so %_DEST%\lib%_EXT%\libucp*.so +..\%__SRC%\lib\libucp*.a %_DEST%\lib%_EXT%\libucp*.a ..\%__SRC%\lib\libucp*.dylib %_DEST%\lib%_EXT%\libucp*.dylib ..\%__SRC%\misc\ucp*.map %_DEST%\bin%_EXT%\ucp*.map ..\%__SRC%\misc\ucp*.sym %_DEST%\bin%_EXT%\ucp*.sym --- ./framework/prj/d.lst.orig 2003-07-17 02:39:46.000000000 +0900 +++ ./framework/prj/d.lst 2004-01-13 23:00:04.000000000 +0900 @@ -5,6 +5,7 @@ ..\%__SRC%\bin\*.exe %_DEST%\bin%_EXT%\* ..\%__SRC%\bin\login %_DEST%\bin%_EXT%\login.bin ..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT% +..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT% ..\%__SRC%\lib\lib*.dylib %_DEST%\lib%_EXT% ..\dtd\menubar.dtd %_DEST%\bin%_EXT%\menubar.dtd --- ./sax/prj/d.lst.orig 2001-03-03 07:35:28.000000000 +0900 +++ ./sax/prj/d.lst 2004-01-13 23:16:54.000000000 +0900 @@ -1,5 +1,6 @@ ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll ..\%__SRC%\lib\*.so %_DEST%\lib%_EXT%\*.so +..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib --- ./xmlhelp/prj/d.lst.orig 2003-05-28 00:54:02.000000000 +0900 +++ ./xmlhelp/prj/d.lst 2004-01-13 23:22:10.000000000 +0900 @@ -1,5 +1,6 @@ ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.* ..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT% +..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT% ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.* ..\%__SRC%\class\*.jar %_DEST%\bin%_EXT%\*.* ..\%__SRC%\misc\helpserver.sh %_DEST%\bin%_EXT%\helpserver --- ./fileaccess/prj/d.lst.orig 2003-06-02 18:10:52.000000000 +0900 +++ ./fileaccess/prj/d.lst 2004-01-13 22:09:44.000000000 +0900 @@ -1,6 +1,7 @@ ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\* ..\%__SRC%\bin\*.rdb %_DEST%\rdb%_EXT%\* ..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT% +..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT% ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\* ..\source\fileacc.xml %_DEST%\xml%_EXT%\fileacc.xml --- ./comphelper/prj/d.lst.orig 2003-05-28 00:45:54.000000000 +0900 +++ ./comphelper/prj/d.lst 2003-12-27 11:58:48.000000000 +0900 @@ -1,6 +1,7 @@ ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll ..\%__SRC%\lib\*.lib %_DEST%\lib%_EXT%\*.lib ..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT% +..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT% ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib ..\%__SRC%\lib\*.sl %_DEST%\lib%_EXT%\*.sl ..\%__SRC%\bin\*.bin %_DEST%\bin%_EXT%\*.bin --- ./configmgr/prj/d.lst.orig 2003-05-28 00:56:34.000000000 +0900 +++ ./configmgr/prj/d.lst 2004-01-13 22:02:14.000000000 +0900 @@ -1,5 +1,6 @@ mkdir: %_DEST%\inc%_EXT%\configmgr ..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT% +..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT% ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib ..\%__SRC%\lib\*.sl %_DEST%\lib%_EXT%\*.sl ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll --- ./external/prj/d.lst.orig 2003-08-19 19:50:56.000000000 +0900 +++ ./external/prj/d.lst 2003-12-31 09:34:34.000000000 +0900 @@ -48,6 +48,7 @@ ..\%__SRC%\slo\PluginNew.* %_DEST%\lib%_EXT%\* ..\%__SRC%\slb\gnu_getopt.lib %_DEST%\lib%_EXT%\gnu_getopt.lib ..\%__SRC%\lib\libgnu_getopt.a %_DEST%\lib%_EXT%\libgnu_getopt.a +..\%__SRC%\lib\libgnu_getopt_static.a %_DEST%\lib%_EXT%\libgnu_getopt_static.a ..\%__SRC%\slb\zlib.lib %_DEST%\lib%_EXT%\zlib.lib ..\%__SRC%\lib\libzlib.a %_DEST%\lib%_EXT%\libzlib.a ..\%__SRC%\lib\libfreetype.a %_DEST%\lib%_EXT%\libfreetype.a @@ -66,6 +67,7 @@ ..\%__SRC%\slb\gpc.lib %_DEST%\lib%_EXT%\gpc.lib ..\%__SRC%\lib\libgpc.a %_DEST%\lib%_EXT%\libgpc.a +..\%__SRC%\lib\libgpc_static.a %_DEST%\lib%_EXT%\libgpc_static.a ..\%__SRC%\lib\libautorec*.* %_DEST%\lib%_EXT%\lib*.* @@ -79,6 +81,9 @@ ..\msvcp70\msvcp70.dll %_DEST%\bin%_EXT%\msvcp70.dll ..\msvcp70\msvcr70.dll %_DEST%\bin%_EXT%\msvcr70.dll +..\msvcp71\msvcp71.dll %_DEST%\bin%_EXT%\msvcp71.dll +..\msvcp71\msvcr71.dll %_DEST%\bin%_EXT%\msvcr71.dll + ..\unicows\unicows.dll %_DEST%\bin%_EXT%\unicows.dll ..\X11\extensions\*.h %_DEST%\inc%_EXT%\X11\extensions\*.h --- ./external/glibc/rtufiles/getopt.h.orig 2003-09-03 08:11:22.000000000 +0900 +++ ./external/glibc/rtufiles/getopt.h 2003-11-01 12:15:22.000000000 +0900 @@ -131,20 +131,20 @@ /* Many other libraries have conflicting prototypes for getopt, with differences in the consts, in stdlib.h. To avoid compilation errors, only prototype getopt for the GNU C library. */ -extern int getopt (int __argc, char *const *__argv, const char *__shortopts); +extern int getopt (int ___argc, char *const *___argv, const char *__shortopts); # else /* not __GNU_LIBRARY__ */ extern int getopt (); # endif /* __GNU_LIBRARY__ */ # ifndef __need_getopt -extern int getopt_long (int __argc, char *const *__argv, const char *__shortopts, +extern int getopt_long (int ___argc, char *const *___argv, const char *__shortopts, const struct option *__longopts, int *__longind); -extern int getopt_long_only (int __argc, char *const *__argv, +extern int getopt_long_only (int ___argc, char *const *___argv, const char *__shortopts, const struct option *__longopts, int *__longind); /* Internal only. Users should not call this directly. */ -extern int _getopt_internal (int __argc, char *const *__argv, +extern int _getopt_internal (int ___argc, char *const *___argv, const char *__shortopts, const struct option *__longopts, int *__longind, int __long_only); --- ./extensions/prj/d.lst.orig 2003-07-17 02:35:18.000000000 +0900 +++ ./extensions/prj/d.lst 2004-01-13 22:09:04.000000000 +0900 @@ -1,5 +1,6 @@ ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll ..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%\lib*.so +..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT%\lib*.a ..\%__SRC%\lib\lib*.dylib %_DEST%\lib%_EXT%\lib*.dylib ..\%__SRC%\bin\*.bin %_DEST%\bin%_EXT%\*.bin ..\%__SRC%\misc\*.hid %_DEST%\bin%_EXT%\*.hid --- ./unotools/prj/d.lst.orig 2003-05-28 00:51:40.000000000 +0900 +++ ./unotools/prj/d.lst 2004-01-06 06:21:14.000000000 +0900 @@ -1,6 +1,7 @@ ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll ..\%__SRC%\lib\*.lib %_DEST%\lib%_EXT%\*.lib ..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT% +..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT% ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib ..\%__SRC%\lib\*.sl %_DEST%\lib%_EXT%\*.sl ..\%__SRC%\bin\*.bin %_DEST%\bin%_EXT%\*.bin --- ./unzip/source/mapname.c.orig 2000-12-12 03:36:58.000000000 +0900 +++ ./unzip/source/mapname.c 2003-12-14 02:31:54.000000000 +0900 @@ -39,7 +39,7 @@ #endif #ifndef NO_MKDIR -# if (defined(DOS_OS2) && !defined(__GO32__)) +# if (defined(DOS_OS2) && !defined(__GO32__)) || defined(__MINGW32__) # if (_MSC_VER >= 600) /* have special MSC mkdir prototype */ # include # else /* own prototype because dir.h conflicts? */ --- ./unzip/inc/unzip.h.orig 2003-04-29 02:02:32.000000000 +0900 +++ ./unzip/inc/unzip.h 2003-12-14 02:42:36.000000000 +0900 @@ -1274,6 +1274,8 @@ #endif #ifndef UNX +#ifndef __MINGW32__ typedef void UnzipCallBack ( long nBytesWritten ); extern UnzipCallBack *pCallBack; #endif +#endif --- ./eventattacher/prj/d.lst.orig 2003-05-28 00:47:46.000000000 +0900 +++ ./eventattacher/prj/d.lst 2004-01-13 22:08:30.000000000 +0900 @@ -1,3 +1,4 @@ ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT% ..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT% +..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT% ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT% --- ./io/prj/d.lst.orig 2003-04-24 01:20:26.000000000 +0900 +++ ./io/prj/d.lst 2004-01-13 23:04:20.000000000 +0900 @@ -4,6 +4,7 @@ ..\source\connector\connectr.xml %_DEST%\xml%_EXT%\connector.uno.xml ..\source\stm\stm.xml %_DEST%\xml%_EXT%\streams.uno.xml ..\%__SRC%\lib\*.so %_DEST%\lib%_EXT%\* +..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\* ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\* ..\%__SRC%\lib\lib*static*.dylib %_DEST%\lib%_EXT%\lib*static*.dylib --- ./svtools/source/uno/registerservices.cxx.orig 2003-06-12 17:22:54.000000000 +0900 +++ ./svtools/source/uno/registerservices.cxx 2004-01-17 15:01:14.000000000 +0900 @@ -156,7 +156,8 @@ { try { - ::rtl::OUString sImplKeyName( '/' ); + ::rtl::OUString sImplKeyName; + sImplKeyName = String( sal_Unicode('/') ); sImplKeyName += _rImplName; sImplKeyName += ::rtl::OUString::createFromAscii( "/UNO/SERVICES" ); Reference< XRegistryKey > xNewKey = _rxLocation->createKey( sImplKeyName ); --- ./svtools/source/svdde/ddedata.cxx.orig 2001-03-09 06:14:02.000000000 +0900 +++ ./svtools/source/svdde/ddedata.cxx 2004-01-14 23:56:18.000000000 +0900 @@ -240,7 +240,11 @@ TCHAR szName[ 256 ]; if( GetClipboardFormatName( nFmt, szName, sizeof(szName) ) ) +#ifdef __MINGW32__ + nFmt = SotExchange::RegisterFormatName( String(reinterpret_cast< unsigned short int * >(szName)) ); +#else nFmt = SotExchange::RegisterFormatName( String(szName) ); +#endif } #endif #if defined(PM2) --- ./svtools/source/svdde/ddeinf.cxx.orig 2000-09-19 01:59:06.000000000 +0900 +++ ./svtools/source/svdde/ddeinf.cxx 2004-01-15 00:04:56.000000000 +0900 @@ -136,7 +136,11 @@ *p++ = '|'; *p = 0; DdeQueryString( hDdeInst, aInf.hszTopic, p, sizeof(buf)/sizeof(TCHAR)-lstrlen( buf ), CP_WINUNICODE ); +#ifdef __MINGW32__ + aServices.Insert( new String( reinterpret_cast< unsigned short int * >(buf) ) ); +#else aServices.Insert( new String( buf ) ); +#endif } } DdeDisconnectList( hConvList ); @@ -164,11 +168,19 @@ DdeTopicList::DdeTopicList( const String& rService ) { +#ifdef __MINGW32__ + DdeConnection aSys( rService, String( reinterpret_cast< unsigned short int * >(SZDDESYS_TOPIC) ) ); +#else DdeConnection aSys( rService, String( SZDDESYS_TOPIC ) ); +#endif if ( !aSys.GetError() ) { +#ifdef __MINGW32__ + DdeRequest aReq( aSys, String( reinterpret_cast< unsigned short int * >(SZDDESYS_ITEM_TOPICS) ), 500 ); +#else DdeRequest aReq( aSys, String( SZDDESYS_ITEM_TOPICS ), 500 ); +#endif aReq.SetDataHdl( LINK( this, DdeTopicList, Data ) ); aReq.Execute(); } --- ./svtools/source/svdde/ddesvr.cxx.orig 2001-09-05 02:05:08.000000000 +0900 +++ ./svtools/source/svdde/ddesvr.cxx 2004-01-16 01:59:00.000000000 +0900 @@ -147,7 +147,11 @@ while( STRING_NOTFOUND != n ) { String s( sTopics.GetToken( 0, '\t', n )); +#ifdef __MINGW32__ + if( s == reinterpret_cast< unsigned short int * >(chTopicBuf) ) +#else if( s == chTopicBuf ) +#endif ++nTopics; } } @@ -201,7 +205,11 @@ { String s( sTopics.GetToken( 0, '\t', n )); s.EraseAllChars( '\n' ).EraseAllChars( '\r' ); +#ifdef __MINGW32__ + if( !hText1 || s == reinterpret_cast< unsigned short int * >(chTopicBuf) ) +#else if( !hText1 || s == chTopicBuf ) +#endif { DdeString aDStr( pInst->hDdeInstSvr, s ); pTopic = FindTopic( *pService, (HSZ)aDStr ); @@ -303,6 +311,17 @@ String aRes; // darf erst am Ende freigegeben werden!! if ( pTopic->IsSystemTopic() ) { +#ifdef __MINGW32__ + if ( pTopic->aItem == reinterpret_cast< const unsigned short int * >(SZDDESYS_ITEM_TOPICS) ) + aRes = pService->Topics(); + else if ( pTopic->aItem == reinterpret_cast< const unsigned short int * >(SZDDESYS_ITEM_SYSITEMS) ) + aRes = pService->SysItems(); + else if ( pTopic->aItem == reinterpret_cast< const unsigned short int * >(SZDDESYS_ITEM_STATUS) ) + aRes = pService->Status(); + else if ( pTopic->aItem == reinterpret_cast< const unsigned short int * >(SZDDESYS_ITEM_FORMATS) ) + aRes = pService->Formats(); + else if ( pTopic->aItem == reinterpret_cast< const unsigned short int * >(SZDDESYS_ITEM_HELP) ) +#else if ( pTopic->aItem == SZDDESYS_ITEM_TOPICS ) aRes = pService->Topics(); else if ( pTopic->aItem == SZDDESYS_ITEM_SYSITEMS ) @@ -312,6 +331,7 @@ else if ( pTopic->aItem == SZDDESYS_ITEM_FORMATS ) aRes = pService->Formats(); else if ( pTopic->aItem == SZDDESYS_ITEM_HELP ) +#endif aRes = pService->GetHelp(); else aRes = pService->SysTopicGet( pTopic->aItem ); @@ -455,7 +475,11 @@ // dann befragen wir doch mal unsere Ableitung: TCHAR chBuf[250]; DdeQueryString(pInst->hDdeInstSvr,hTopic,chBuf,sizeof(chBuf)/sizeof(TCHAR),CP_WINUNICODE ); +#ifdef __MINGW32__ + bWeiter = rService.MakeTopic( reinterpret_cast< const unsigned short int * >(chBuf) ); +#else bWeiter = rService.MakeTopic( chBuf ); +#endif // dann muessen wir noch mal suchen } while( bWeiter ); @@ -485,7 +509,11 @@ // dann befragen wir doch mal unsere Ableitung: TCHAR chBuf[250]; DdeQueryString(pInst->hDdeInstSvr,hItem,chBuf,sizeof(chBuf)/sizeof(TCHAR),CP_WINUNICODE ); +#ifdef __MINGW32__ + bWeiter = rTopic.MakeItem( reinterpret_cast< unsigned short int * >(chBuf) ); +#else bWeiter = rTopic.MakeItem( chBuf ); +#endif // dann muessen wir noch mal suchen } while( bWeiter ); @@ -526,12 +554,21 @@ nStatus = DMLERR_SYS_ERROR; AddFormat( FORMAT_STRING ); +#ifdef __MINGW32__ + pSysTopic = new DdeTopic( reinterpret_cast< const unsigned short int * >(SZDDESYS_TOPIC) ); + pSysTopic->AddItem( DdeItem( reinterpret_cast< const unsigned short int * >(SZDDESYS_ITEM_TOPICS) ) ); + pSysTopic->AddItem( DdeItem( reinterpret_cast< const unsigned short int * >(SZDDESYS_ITEM_SYSITEMS) ) ); + pSysTopic->AddItem( DdeItem( reinterpret_cast< const unsigned short int * >(SZDDESYS_ITEM_STATUS) ) ); + pSysTopic->AddItem( DdeItem( reinterpret_cast< const unsigned short int * >(SZDDESYS_ITEM_FORMATS) ) ); + pSysTopic->AddItem( DdeItem( reinterpret_cast< const unsigned short int * >(SZDDESYS_ITEM_HELP) ) ); +#else pSysTopic = new DdeTopic( SZDDESYS_TOPIC ); pSysTopic->AddItem( DdeItem( SZDDESYS_ITEM_TOPICS ) ); pSysTopic->AddItem( DdeItem( SZDDESYS_ITEM_SYSITEMS ) ); pSysTopic->AddItem( DdeItem( SZDDESYS_ITEM_STATUS ) ); pSysTopic->AddItem( DdeItem( SZDDESYS_ITEM_FORMATS ) ); pSysTopic->AddItem( DdeItem( SZDDESYS_ITEM_HELP ) ); +#endif AddTopic( *pSysTopic ); } @@ -683,7 +720,11 @@ BOOL DdeTopic::IsSystemTopic() { +#ifdef __MINGW32__ + return BOOL (GetName() == reinterpret_cast< const unsigned short int * >(SZDDESYS_TOPIC)); +#else return BOOL (GetName() == SZDDESYS_TOPIC); +#endif } // --- DdeTopic::AddItem() ----------------------------------------- @@ -1049,8 +1090,13 @@ { String s; long f; +#ifdef __MINGW32__ + unsigned short int buf[128]; + const unsigned short int * p; +#else TCHAR buf[128]; LPCTSTR p; +#endif short n = 0; for ( f = aFormats.First(); f; f = aFormats.Next(), n++ ) @@ -1087,8 +1133,12 @@ p= String::CreateFromAscii("PRIVATE").GetBuffer(); #else default: +#ifdef __MINGW32__ + GetClipboardFormatName( (UINT)f, reinterpret_cast< LPTSTR >(buf), sizeof(buf) / sizeof(TCHAR) ); +#else GetClipboardFormatName( (UINT)f, buf, sizeof(buf) / sizeof(TCHAR) ); #endif +#endif } s += String( p ); } --- ./svtools/source/filter.vcl/jpeg/jpeg.cxx.orig 2002-08-20 00:02:56.000000000 +0900 +++ ./svtools/source/filter.vcl/jpeg/jpeg.cxx 2004-01-16 02:12:38.000000000 +0900 @@ -59,11 +59,6 @@ * ************************************************************************/ -extern "C" -{ - #include "jpeg.h" -} - #define _JPEGPRIVATE #include @@ -72,6 +67,11 @@ #include "FilterConfigItem.hxx" #include "filter.hxx" +extern "C" +{ + #include "jpeg.h" +} + // ----------- // - Defines - // ----------- --- ./svtools/prj/d.lst.orig 2003-07-17 03:11:00.000000000 +0900 +++ ./svtools/prj/d.lst 2004-01-13 23:20:50.000000000 +0900 @@ -39,6 +39,8 @@ ..\%__SRC%\misc\svt?????.map %_DEST%\bin%_EXT%\svt?????.map ..\%__SRC%\lib\libsvt?????.so %_DEST%\lib%_EXT%\* ..\%__SRC%\lib\libsvl?????.so %_DEST%\lib%_EXT%\* +..\%__SRC%\lib\libsvt?????.a %_DEST%\lib%_EXT%\* +..\%__SRC%\lib\libsvl?????.a %_DEST%\lib%_EXT%\* ..\%__SRC%\lib\libsv*.dylib %_DEST%\lib%_EXT%\* ..\%__SRC%\misc\svtools.hid %_DEST%\bin%_EXT%\svtools.hid ..\%__SRC%\inc\svtools\proped.hxx %_DEST%\inc%_EXT%\svtools\proped.hxx --- ./tools/symbol/symbol.cxx.orig 2000-09-19 02:03:10.000000000 +0900 +++ ./tools/symbol/symbol.cxx 2003-12-31 09:51:54.000000000 +0900 @@ -112,7 +112,11 @@ pMap[nSize] = '\0'; #else +#ifdef __MINGW32__ + SvFileStream aMap( String( *(argv+1), gsl_getSystemTextEncoding()), STREAM_READ ); // gcc bug?? +#else SvFileStream aMap( String( argv[1], gsl_getSystemTextEncoding()), STREAM_READ ); +#endif nSize = aMap.Seek( STREAM_SEEK_TO_END ); if( aMap.GetError() ) @@ -159,7 +163,11 @@ if( n != nLines ) return Error( 5, "n", n ); +#ifdef __MINGW32__ + SvFileStream aLeak( String( *(argv+2), gsl_getSystemTextEncoding()), STREAM_READ ); +#else SvFileStream aLeak( String( argv[2], gsl_getSystemTextEncoding()), STREAM_READ ); +#endif ByteString aLine; aLeak.ReadLine( aLine ); --- ./tools/source/fsys/dirent.cxx.orig 2003-05-02 23:56:16.000000000 +0900 +++ ./tools/source/fsys/dirent.cxx 2003-12-27 12:25:50.000000000 +0900 @@ -2313,7 +2313,7 @@ /* Prefix can have 5 chars, leaving 3 for numbers. 26 ** 3 == 17576 */ -#if (defined (MSC) || defined (BLC) || defined(ICC) ) && ( defined (WIN) || defined (WNT)) +#if (defined (MSC) || defined (BLC) || defined(ICC) || defined(__MINGW32__)) && ( defined (WIN) || defined (WNT)) static unsigned long u = GetTickCount(); #else static unsigned long u = clock(); --- ./tools/source/fsys/comdep.hxx.orig 2000-09-19 02:03:06.000000000 +0900 +++ ./tools/source/fsys/comdep.hxx 2003-12-27 12:23:00.000000000 +0900 @@ -98,8 +98,12 @@ #else #if defined( WNT ) && !defined( WTC ) +#ifdef __MINGW32__ +#include "wntgcc.hxx" +#else #include "wntmsc.hxx" #endif +#endif #ifdef UNX #include "unx.hxx" --- ./tools/source/fsys/wntgcc.hxx.orig 2000-09-19 02:03:08.000000000 +0900 +++ ./tools/source/fsys/wntgcc.hxx 2003-12-27 12:24:16.000000000 +0900 @@ -111,7 +111,7 @@ #define PATHDELIMITER ";" #define DEFSTYLE FSYS_STYLE_NTFS #define MKDIR( p ) mkdir( p ) -#define CMP_LOWER(s) ( ByteString(s).ToLowerAscii() ) +#define CMP_LOWER(s) (s) #include #define START_DRV 'a' --- ./tools/inc/solar.h.orig 2003-06-12 19:30:28.000000000 +0900 +++ ./tools/inc/solar.h 2004-01-06 23:32:58.000000000 +0900 @@ -101,7 +101,7 @@ typedef char INT8; typedef unsigned char UINT8; #else -#if !defined(_MSC_VER) || defined(_MSC_VER) && (_MSC_VER < 1200) || (_MSC_VER >= 1200 ) && !defined(VCL_NEED_BASETSD ) +#if !defined(__MINGW32__) && !defined(_MSC_VER) || defined(_MSC_VER) && (_MSC_VER < 1200) || ( (_MSC_VER >= 1200 ) || defined(__MINGW32__) ) && !defined(VCL_NEED_BASETSD ) typedef void INT64; typedef void UINT64; typedef long INT32; --- ./vos/source/signal.cxx.orig 2000-09-19 00:18:18.000000000 +0900 +++ ./vos/source/signal.cxx 2003-12-14 03:02:36.000000000 +0900 @@ -64,7 +64,7 @@ #include #include -#if defined ( _USE_NAMESPACE ) && !defined ( WNT ) +#if defined ( _USE_NAMESPACE ) && !(defined ( WNT ) && !defined(__MINGW32__)) oslSignalAction SAL_CALL _OSignalHandler_Function(void* pthis, oslSignalInfo* pInfo) { --- ./vos/source/thread.cxx.orig 2001-06-09 01:00:20.000000000 +0900 +++ ./vos/source/thread.cxx 2003-12-14 03:14:28.000000000 +0900 @@ -68,7 +68,7 @@ -#if defined ( _USE_NAMESPACE ) && !defined ( WNT ) +#if defined ( _USE_NAMESPACE ) && !(defined ( WNT ) && !defined(GCC)) void _OThread_WorkerFunction(void* pthis) { --- ./vos/inc/vos/signal.hxx.orig 2000-09-19 00:18:14.000000000 +0900 +++ ./vos/inc/vos/signal.hxx 2003-12-14 03:11:38.000000000 +0900 @@ -80,7 +80,7 @@ { #endif -#if defined ( _USE_NAMESPACE ) && !defined ( WNT ) +#if defined ( _USE_NAMESPACE ) && !(defined ( WNT ) && !defined(__MINGW32__)) oslSignalAction SAL_CALL _cpp_OSignalHandler_Function(void* pthis, oslSignalInfo* pInfo); #endif @@ -133,7 +133,7 @@ protected: oslSignalHandler m_hHandler; -#if defined ( _USE_NAMESPACE ) && defined ( WNT ) +#if defined ( _USE_NAMESPACE ) && (defined ( WNT ) && !defined(__MINGW32__)) friend oslSignalAction SAL_CALL ::_OSignalHandler_Function(void* pthis, oslSignalInfo* pInfo); #elif defined ( _USE_NAMESPACE ) friend oslSignalAction SAL_CALL _cpp_OSignalHandler_Function(void* pthis, oslSignalInfo* pInfo); --- ./registry/tools/checksingleton.cxx.orig 2003-03-27 00:37:48.000000000 +0900 +++ ./registry/tools/checksingleton.cxx 2003-12-14 19:13:24.000000000 +0900 @@ -431,7 +431,7 @@ return bRet; } -#if (defined UNX) || (defined OS2) +#if (defined UNX) || (defined OS2) || (defined __MINGW32__) int main( int argc, char * argv[] ) #else --- ./registry/tools/regcompare.cxx.orig 2002-11-27 23:19:38.000000000 +0900 +++ ./registry/tools/regcompare.cxx 2003-12-14 16:53:12.000000000 +0900 @@ -2102,7 +2102,7 @@ return nError; } -#if (defined UNX) || (defined OS2) +#if (defined UNX) || (defined OS2) || defined __MINGW32__ int main( int argc, char * argv[] ) #else --- ./registry/source/regimpl.cxx.orig 2003-08-15 20:35:26.000000000 +0900 +++ ./registry/source/regimpl.cxx 2003-12-14 15:15:22.000000000 +0900 @@ -68,6 +68,9 @@ #ifdef UNX #include #endif +#ifdef __MINGW32__ +#include +#endif #ifdef MACOSX // Get the store.hxx inlines non-inline, solves crashes in cppumaker --- ./registry/prj/d.lst.orig 2002-08-13 20:48:08.000000000 +0900 +++ ./registry/prj/d.lst 2003-12-21 10:57:02.000000000 +0900 @@ -8,6 +8,7 @@ ..\%__SRC%\lib\libreg*.so.* %_DEST%\lib%_EXT%\libreg*.so.* ..\%__SRC%\lib\librgt*.so %_DEST%\lib%_EXT%\librgt*.so ..\%__SRC%\bin\reg*.dll %_DEST%\bin%_EXT%\reg*.dll +..\%__SRC%\lib\libreg*.a %_DEST%\lib%_EXT%\libreg*.a ..\%__SRC%\lib\libreg*.dylib %_DEST%\lib%_EXT%\libreg*.dylib ..\%__SRC%\lib\libreg*.dylib.* %_DEST%\lib%_EXT%\libreg*.dylib.* --- ./stoc/prj/d.lst.orig 2003-04-24 01:07:28.000000000 +0900 +++ ./stoc/prj/d.lst 2004-01-13 23:19:46.000000000 +0900 @@ -2,6 +2,7 @@ ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\* ..\%__SRC%\lib\*.so %_DEST%\lib%_EXT%\* +..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\* ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib ..\%__SRC%\bin\*.rdb %_DEST%\rdb%_EXT%\* --- ./remotebridges/prj/d.lst.orig 2003-04-24 01:41:58.000000000 +0900 +++ ./remotebridges/prj/d.lst 2004-01-13 23:15:58.000000000 +0900 @@ -5,6 +5,7 @@ ..\source\dynamicloader\dynamicloader.xml %_DEST%\xml%_EXT%\dynamicloader.uno.xml ..\source\unourl_resolver\uuresolver.xml %_DEST%\xml%_EXT%\uuresolver.uno.xml ..\%__SRC%\lib\*.so %_DEST%\lib%_EXT%\* +..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\* ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\* ..\%__SRC%\lib\lib*static*.dylib %_DEST%\lib%_EXT%\lib*static*.dylib --- ./bridges/source/cpp_uno/mingw_intel/cpp2uno.cxx.orig 2001-10-26 16:22:58.000000000 +0900 +++ ./bridges/source/cpp_uno/mingw_intel/cpp2uno.cxx 2003-12-25 22:21:06.000000000 +0900 @@ -99,11 +99,13 @@ // return typelib_TypeDescription * pReturnTypeDescr = 0; if (pReturnTypeRef) + { TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef ); - + } + void * pUnoReturn = 0; void * pCppReturn = 0; // complex return ptr: if != 0 && != pUnoReturn, reconversion need - + if (pReturnTypeDescr) { if (cppu_isSimpleType( pReturnTypeDescr )) @@ -114,7 +116,7 @@ { pCppReturn = *(void **)pCppStack; pCppStack += sizeof(void *); - + pUnoReturn = (cppu_relatesToInterface( pReturnTypeDescr ) ? alloca( pReturnTypeDescr->nSize ) : pCppReturn); // direct way @@ -132,9 +134,9 @@ sal_Int32 * pTempIndizes = (sal_Int32 *)(pUnoArgs + (2 * nParams)); // type descriptions for reconversions typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pUnoArgs + (3 * nParams)); - - sal_Int32 nTempIndizes = 0; - + + sal_Int32 nTempIndizes = 0; + for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos ) { const typelib_MethodParameter & rParam = pParams[nPos]; @@ -170,9 +172,10 @@ // is in/inout else if (cppu_relatesToInterface( pParamTypeDescr )) { - uno_copyAndConvertData( pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize ), - *(void **)pCppStack, pParamTypeDescr, - &pThis->pBridge->aCpp2Uno ); + ::uno_copyAndConvertData( + pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize ), + *(void **)pCppStack, pParamTypeDescr, + &pThis->pBridge->aCpp2Uno ); pTempIndizes[nTempIndizes] = nPos; // has to be reconverted // will be released at reconversion ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr; @@ -186,29 +189,33 @@ } pCppStack += sizeof(sal_Int32); // standard parameter length } - + // ExceptionHolder uno_Any aUnoExc; // Any will be constructed by callee uno_Any * pUnoExc = &aUnoExc; // invoke uno dispatch call (*pThis->pUnoI->pDispatcher)( pThis->pUnoI, pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc ); - + // in case an exception occured... if (pUnoExc) { // destruct temporary in/inout params - for ( ; nTempIndizes--; ) + while (nTempIndizes--) { sal_Int32 nIndex = pTempIndizes[nTempIndizes]; - + if (pParams[nIndex].bIn) // is in/inout => was constructed - uno_destructData( pUnoArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], 0 ); + { + ::uno_destructData( pUnoArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], 0 ); + } TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] ); } if (pReturnTypeDescr) + { TYPELIB_DANGER_RELEASE( pReturnTypeDescr ); - + } + raiseException( &aUnoExc, &pThis->pBridge->aUno2Cpp ); // has to destruct the any // is here for dummy return typelib_TypeClass_VOID; @@ -216,21 +223,23 @@ else // else no exception occured... { // temporary params - for ( ; nTempIndizes--; ) + while (nTempIndizes--) { sal_Int32 nIndex = pTempIndizes[nTempIndizes]; typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes]; - + if (pParams[nIndex].bOut) // inout/out { // convert and assign - uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release ); - uno_copyAndConvertData( pCppArgs[nIndex], pUnoArgs[nIndex], pParamTypeDescr, - &pThis->pBridge->aUno2Cpp ); + ::uno_destructData( + pCppArgs[nIndex], pParamTypeDescr, cpp_release ); + ::uno_copyAndConvertData( + pCppArgs[nIndex], pUnoArgs[nIndex], pParamTypeDescr, + &pThis->pBridge->aUno2Cpp ); } // destroy temp uno param - uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 ); - + ::uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 ); + TYPELIB_DANGER_RELEASE( pParamTypeDescr ); } // return @@ -238,10 +247,12 @@ { if (pUnoReturn != pCppReturn) // needs reconversion { - uno_copyAndConvertData( pCppReturn, pUnoReturn, pReturnTypeDescr, - &pThis->pBridge->aUno2Cpp ); + ::uno_copyAndConvertData( + pCppReturn, pUnoReturn, pReturnTypeDescr, + &pThis->pBridge->aUno2Cpp ); // destroy temp uno return - uno_destructData( pUnoReturn, pReturnTypeDescr, 0 ); + ::uno_destructData( + pUnoReturn, pReturnTypeDescr, 0 ); } // complex return ptr is set to eax *(void **)pRegisterReturn = pCppReturn; @@ -265,37 +276,38 @@ sal_Int64 * pRegisterReturn /* space for register return */ ) { OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" ); - + // pCallStack: ret adr, [ret *], this, params // _this_ ptr is patched cppu_XInterfaceProxy object - cppu_cppInterfaceProxy * pCppI = NULL; + cppu_cppInterfaceProxy * pThis = NULL; if( nVtableCall & 0x80000000 ) { nVtableCall &= 0x7fffffff; - pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +2); + pThis = static_cast< cppu_cppInterfaceProxy * >( + reinterpret_cast< XInterface * >( pCallStack[2] ) ); } else { - pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +1); + pThis = static_cast< cppu_cppInterfaceProxy * >( + reinterpret_cast< XInterface * >( pCallStack[1] ) ); } - typelib_InterfaceTypeDescription * pTypeDescr = pCppI->pTypeDescr; + typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr; OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" ); if (nVtableCall >= pTypeDescr->nMapFunctionIndexToMemberIndex) { - throw RuntimeException( - OUString::createFromAscii("illegal vtable index!"), - (XInterface *)pCppI ); + throw RuntimeException( OUString( RTL_CONSTASCII_USTRINGPARAM("illegal vtable index!") ), + (XInterface *)pThis ); } - + // determine called method OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" ); sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nVtableCall]; OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### illegal member index!" ); TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] ); - + typelib_TypeClass eRet; switch (aMemberDescr.get()->eTypeClass) { @@ -305,7 +317,7 @@ { // is GET method eRet = cpp2uno_call( - pCppI, aMemberDescr.get(), + pThis, aMemberDescr.get(), ((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef, 0, 0, // no params pCallStack, pRegisterReturn ); @@ -318,9 +330,9 @@ ((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef; aParam.bIn = sal_True; aParam.bOut = sal_False; - + eRet = cpp2uno_call( - pCppI, aMemberDescr.get(), + pThis, aMemberDescr.get(), 0, // indicates void return 1, &aParam, pCallStack, pRegisterReturn ); @@ -332,12 +344,13 @@ // is METHOD switch (nVtableCall) { + // standard XInterface vtable calls case 1: // acquire() - pCppI->acquireProxy(); // non virtual call! + pThis->acquireProxy(); // non virtual call! eRet = typelib_TypeClass_VOID; break; case 2: // release() - pCppI->releaseProxy(); // non virtual call! + pThis->releaseProxy(); // non virtual call! eRet = typelib_TypeClass_VOID; break; case 0: // queryInterface() opt @@ -345,12 +358,12 @@ typelib_TypeDescription * pTD = 0; TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pCallStack[3] )->getTypeLibType() ); if (pTD) - { + { XInterface * pInterface = 0; - (*pCppI->pBridge->pCppEnv->getRegisteredInterface)( - pCppI->pBridge->pCppEnv, - (void **)&pInterface, pCppI->oid.pData, (typelib_InterfaceTypeDescription *)pTD ); - + (*pThis->pBridge->pCppEnv->getRegisteredInterface)( + pThis->pBridge->pCppEnv, + (void **)&pInterface, pThis->oid.pData, (typelib_InterfaceTypeDescription *)pTD ); + if (pInterface) { ::uno_any_construct( @@ -367,7 +380,7 @@ } // else perform queryInterface() default: eRet = cpp2uno_call( - pCppI, aMemberDescr.get(), + pThis, aMemberDescr.get(), ((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef, ((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams, ((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams, @@ -378,8 +391,8 @@ default: { throw RuntimeException( - OUString::createFromAscii("no member description found!"), - (XInterface *)pCppI ); + OUString( RTL_CONSTASCII_USTRINGPARAM("no member description found!") ), + (XInterface *)pThis ); // is here for dummy eRet = typelib_TypeClass_VOID; } @@ -546,7 +559,7 @@ //================================================================================================== void SAL_CALL cppu_cppInterfaceProxy_patchVtable( - XInterface * pCppI, typelib_InterfaceTypeDescription * pTypeDescr ) throw () + XInterface * pThis, typelib_InterfaceTypeDescription * pTypeDescr ) throw () { static MediateClassData * s_pMediateClassData = 0; if (! s_pMediateClassData) @@ -562,7 +575,7 @@ #endif } } - *(void const **)pCppI = s_pMediateClassData->get_vtable( pTypeDescr ); + *(void const **)pThis = s_pMediateClassData->get_vtable( pTypeDescr ); } } @@ -573,22 +586,19 @@ sal_Bool SAL_CALL component_canUnload( TimeValue * pTime ) SAL_THROW_EXTERN_C() { - return CPPU_CURRENT_NAMESPACE::g_moduleCount.canUnload( - &CPPU_CURRENT_NAMESPACE::g_moduleCount, pTime ); + return CPPU_CURRENT_NAMESPACE::g_moduleCount.canUnload( &CPPU_CURRENT_NAMESPACE::g_moduleCount, pTime ); } //################################################################################################## void SAL_CALL uno_initEnvironment( uno_Environment * pCppEnv ) SAL_THROW_EXTERN_C() { - CPPU_CURRENT_NAMESPACE::cppu_cppenv_initEnvironment( - pCppEnv ); + CPPU_CURRENT_NAMESPACE::cppu_cppenv_initEnvironment( pCppEnv ); } //################################################################################################## void SAL_CALL uno_ext_getMapping( uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo ) SAL_THROW_EXTERN_C() { - CPPU_CURRENT_NAMESPACE::cppu_ext_getMapping( - ppMapping, pFrom, pTo ); + CPPU_CURRENT_NAMESPACE::cppu_ext_getMapping( ppMapping, pFrom, pTo ); } } --- ./bridges/source/cpp_uno/mingw_intel/uno2cpp.cxx.orig 2003-04-01 19:40:20.000000000 +0900 +++ ./bridges/source/cpp_uno/mingw_intel/uno2cpp.cxx 2003-12-25 00:36:12.000000000 +0900 @@ -164,10 +164,9 @@ sal_Int32 nParams, typelib_MethodParameter * pParams, void * pUnoReturn, void * pUnoArgs[], uno_Any ** ppUnoExc ) { - // max space for: [complex ret ptr], values|ptr ... - char * pCppStack = - (char *)alloca( sizeof(sal_Int32) + ((nParams+2) * sizeof(sal_Int64)) ); - char * pCppStackStart = pCppStack; + // max space for: [complex ret ptr], values|ptr ... + char * pCppStack = (char *)alloca( sizeof(sal_Int32) + ((nParams+2) * sizeof(sal_Int64)) ); + char * pCppStackStart = pCppStack; // return typelib_TypeDescription * pReturnTypeDescr = 0; @@ -196,6 +195,7 @@ pCppStack += sizeof( void* ); // stack space + OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" ); // args void ** pCppArgs = (void **)alloca( 3 * sizeof(void *) * nParams ); @@ -214,8 +214,9 @@ if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr )) { - uno_copyAndConvertData( pCppArgs[nPos] = pCppStack, pUnoArgs[nPos], pParamTypeDescr, - &pThis->pBridge->aUno2Cpp ); + ::uno_copyAndConvertData( + pCppArgs[nPos] = pCppStack, pUnoArgs[nPos], pParamTypeDescr, + &pThis->pBridge->aUno2Cpp ); switch (pParamTypeDescr->eTypeClass) { @@ -232,7 +233,7 @@ if (! rParam.bIn) // is pure out { // cpp out is constructed mem, uno out is not! - uno_constructData( + ::uno_constructData( *(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ), pParamTypeDescr ); pTempIndizes[nTempIndizes] = nPos; // default constructed for cpp call @@ -242,9 +243,10 @@ // is in/inout else if (cppu_relatesToInterface( pParamTypeDescr )) { - uno_copyAndConvertData( + ::uno_copyAndConvertData( *(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ), - pUnoArgs[nPos], pParamTypeDescr, &pThis->pBridge->aUno2Cpp ); + pUnoArgs[nPos], pParamTypeDescr, + &pThis->pBridge->aUno2Cpp ); pTempIndizes[nTempIndizes] = nPos; // has to be reconverted // will be released at reconversion @@ -262,74 +264,85 @@ try { - OSL_ENSURE( !( (pCppStack - pCppStackStart ) & 3), "UNALIGNED STACK !!! (Please DO panic)" ); - callVirtualMethod( - pThis->pCppI, nVtableCall, - pCppReturn, pReturnTypeDescr->eTypeClass, - (sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32) ); - // NO exception occured... - *ppUnoExc = 0; - - // reconvert temporary params - for ( ; nTempIndizes--; ) - { - sal_Int32 nIndex = pTempIndizes[nTempIndizes]; - typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes]; + OSL_ENSURE( !( (pCppStack - pCppStackStart ) & 3), "UNALIGNED STACK !!! (Please DO panic)" ); + callVirtualMethod( + pThis->pCppI, nVtableCall, + pCppReturn, pReturnTypeDescr->eTypeClass, + (sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32) ); - if (pParams[nIndex].bIn) + // NO exception occured... + *ppUnoExc = 0; + + // reconvert temporary params + while (nTempIndizes--) { - if (pParams[nIndex].bOut) // inout + sal_Int32 nIndex = pTempIndizes[nTempIndizes]; + typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes]; + + if (pParams[nIndex].bIn) { - uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 ); // destroy uno value - uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr, - &pThis->pBridge->aCpp2Uno ); + if (pParams[nIndex].bOut) // inout + { + ::uno_destructData( + pUnoArgs[nIndex], pParamTypeDescr, 0 ); // destroy uno value + ::uno_copyAndConvertData( + pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr, + &pThis->pBridge->aCpp2Uno ); + } } + else // pure out + { + ::uno_copyAndConvertData( + pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr, + &pThis->pBridge->aCpp2Uno ); + } + // destroy temp cpp param => cpp: every param was constructed + ::uno_destructData( + pCppArgs[nIndex], pParamTypeDescr, cpp_release ); + + TYPELIB_DANGER_RELEASE( pParamTypeDescr ); } - else // pure out + // return value + if (pCppReturn && pUnoReturn != pCppReturn) { - uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr, - &pThis->pBridge->aCpp2Uno ); + ::uno_copyAndConvertData( + pUnoReturn, pCppReturn, pReturnTypeDescr, + &pThis->pBridge->aCpp2Uno ); + ::uno_destructData( + pCppReturn, pReturnTypeDescr, cpp_release ); } - // destroy temp cpp param => cpp: every param was constructed - uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release ); - - TYPELIB_DANGER_RELEASE( pParamTypeDescr ); - } - // return value - if (pCppReturn && pUnoReturn != pCppReturn) - { - uno_copyAndConvertData( pUnoReturn, pCppReturn, pReturnTypeDescr, - &pThis->pBridge->aCpp2Uno ); - uno_destructData( pCppReturn, pReturnTypeDescr, cpp_release ); - } } catch (...) { // fill uno exception fillUnoException( __cxa_get_globals()->caughtExceptions, *ppUnoExc, &pThis->pBridge->aCpp2Uno ); - // temporary params - for ( ; nTempIndizes--; ) { - sal_Int32 nIndex = pTempIndizes[nTempIndizes]; - // destroy temp cpp param => cpp: every param was constructed - uno_destructData( pCppArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], cpp_release ); - TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] ); + // temporary params + while (nTempIndizes--) + { + sal_Int32 nIndex = pTempIndizes[nTempIndizes]; + // destroy temp cpp param => cpp: every param was constructed + ::uno_destructData( + pCppArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], cpp_release ); + TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] ); + } } // return type if (pReturnTypeDescr) + { TYPELIB_DANGER_RELEASE( pReturnTypeDescr ); + } } } - //================================================================================================== void SAL_CALL cppu_unoInterfaceProxy_dispatch( uno_Interface * pUnoI, const typelib_TypeDescription * pMemberDescr, void * pReturn, void * pArgs[], uno_Any ** ppException ) throw () { // is my surrogate - cppu_unoInterfaceProxy * pThis = (cppu_unoInterfaceProxy *)pUnoI; + cppu_unoInterfaceProxy * pThis = static_cast< cppu_unoInterfaceProxy * >( pUnoI ); typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr; switch (pMemberDescr->eTypeClass) @@ -360,7 +373,7 @@ ((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef; aParam.bIn = sal_True; aParam.bOut = sal_False; - + typelib_TypeDescriptionReference * pReturnTypeRef = 0; OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") ); typelib_typedescriptionreference_new( @@ -403,7 +416,7 @@ typelib_TypeDescription * pTD = 0; TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pArgs[0] )->getTypeLibType() ); if (pTD) - { + { uno_Interface * pInterface = 0; (*pThis->pBridge->pUnoEnv->getRegisteredInterface)( pThis->pBridge->pUnoEnv, --- ./bridges/prj/build.lst.orig 2003-07-17 02:32:10.000000000 +0900 +++ ./bridges/prj/build.lst 2003-12-23 22:56:30.000000000 +0900 @@ -5,6 +5,7 @@ br bridges\source\remote\urp nmake - all br_rem_urp br_rem_static NULL br bridges\source\remote\iiop nmake - all br_iiop br_rem_static NULL br bridges\source\remote\context nmake - all br_rcon br_unotypes NULL +br bridges\source\cpp_uno\mingw_intel nmake - w br_gcc3i br_unotypes NULL br bridges\source\cpp_uno\msvc_win32_intel nmake - w br_msci br_unotypes NULL br bridges\source\cpp_uno\gcc2_linux_intel nmake - u br_gccli br_unotypes NULL br bridges\source\cpp_uno\gcc3_linux_intel nmake - u br_gcc3li br_unotypes NULL --- ./jurt/prj/d.lst.orig 2003-03-26 21:33:02.000000000 +0900 +++ ./jurt/prj/d.lst 2004-01-13 23:05:22.000000000 +0900 @@ -1,6 +1,7 @@ ..\%__SRC%\class\jurt.jar %_DEST%\bin%_EXT%\jurt.jar ..\%__SRC%\bin\jpipe*.dll %_DEST%\bin%_EXT%\jpipe*.dll ..\%__SRC%\lib\libjpipe*.so %_DEST%\lib%_EXT%\libjpipe*.so +..\%__SRC%\lib\libjpipe*.a %_DEST%\lib%_EXT%\libjpipe*.a ..\%__SRC%\lib\libjpipe*.dylib %_DEST%\lib%_EXT%\libjpipe*.dylib ..\%__SRC%\bin\jurt_src.zip %COMMON_DEST%\bin%_EXT%\jurt_src.zip --- ./javaunohelper/prj/d.lst.orig 2003-03-26 21:23:48.000000000 +0900 +++ ./javaunohelper/prj/d.lst 2004-01-13 23:04:52.000000000 +0900 @@ -1,6 +1,7 @@ ..\%__SRC%\class\juh.jar %_DEST%\bin%_EXT%\juh.jar ..\%__SRC%\bin\juh*.dll %_DEST%\bin%_EXT%\juh*.dll ..\%__SRC%\lib\libjuh*.so %_DEST%\lib%_EXT%\libjuh*.so +..\%__SRC%\lib\libjuh*.a %_DEST%\lib%_EXT%\libjuh*.a ..\%__SRC%\lib\libjuh*.dylib %_DEST%\lib%_EXT%\libjuh*.dylib ..\%__SRC%\bin\juh_src.zip %COMMON_DEST%\bin%_EXT%\juh_src.zip --- ./ucbhelper/prj/d.lst.orig 2003-07-25 20:36:26.000000000 +0900 +++ ./ucbhelper/prj/d.lst 2003-12-27 13:49:52.000000000 +0900 @@ -1,5 +1,6 @@ ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll ..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%\lib*.so +..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT%\lib*.a ..\%__SRC%\lib\lib*.dylib %_DEST%\lib%_EXT%\lib*.dylib ..\%__SRC%\lib\*.lib %_DEST%\lib%_EXT%\*.lib ..\%__SRC%\misc\*.map %_DEST%\bin%_EXT%\*.map --- ./config_office/set_soenv.in.orig 2003-08-18 23:36:16.000000000 +0900 +++ ./config_office/set_soenv.in 2003-12-21 09:31:20.000000000 +0900 @@ -42,7 +42,7 @@ my ( $outfile, $outfile_sh, $outfile_bat, $bootfile, $newline, $comment, $comment4nt, $compiler, $unsetenv, $setenv, $unset, $set, $ds, $ps, $cur_dir, $par_dir, $I, $L, $D, $buildenv, $answer, $tmp, $Solaris, $Linux, $FreeBSD, $NetBSD, $Tru64, $Irix, $Irix64, $Winnt, $Macosx, $MINGW, $platform, $cygwinver, $machine_type, $empty, $no_ant, $no_stl, $no_gcc_include, - $no_gxx_include, $warnfile, $Warning, $result, $unsetvars, $unsetvarssh, $unsetvarsbat, $exportvars, $win_format_var, $perl_os); + $no_gxx_include, $warnfile, $Warning, $result, $unsetvars, $unsetvarssh, $unsetvarsbat, $exportvars, $win_format_var, $perl_os, $comver, $mingw_format_var, %lib_include_paths, $lib_include_path); # #------------------------------------------------- # IIb. Declaring environment values (constants). @@ -88,7 +88,7 @@ $COMP_ENV, $IENV, $ILIB, $WIN_INCLUDE, $JAVAHOME, $WIN_LIB, $PSDK_HOME, $USE_NEW_SDK, $NO_HIDS, $TEMP, $COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS, $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $USE_GCC3, $ENABLE_DEBUG, $ENABLE_STATIC_GTK, - $PYTHONPATH, $PYTHONHOME ); + $PYTHONPATH, $PYTHONHOME, $GXX_INCLUDE_PATH); # #------------------------------------------- # IId. Declaring the aliases. @@ -138,6 +138,8 @@ $ENABLE_STATIC_GTK = '@ENABLE_STATIC_GTK@'; # Use static gtk libraries $WRAPCMD = ""; # Wrapper (only for winnt) $GLIBC = ""; # Whether the platform uses glibc +$GXX_INCLUDE_PATH = '@GXX_INCLUDE_PATH@'; +chomp( $GXX_INCLUDE_PATH = qx{cygpath "$GXX_INCLUDE_PATH"} ); # #-------------------------------------------------------------------- @@ -516,9 +518,11 @@ if ( $MINGW eq "yes" ) { # At the moment this implies the use of tcsh print "Setting Windows NT cygwin MinGW specific values... "; - $WRAPCMD = "guw.pl"; + $WRAPCMD = "gum.pl"; $outfile = "winmingw.set"; $COM = "GCC"; + # COMPATH for MSC is differently used + $COMPATH =~ s/\/bin$//i; $CVER = "C300"; $DLLSUFFIX = "gi"; $OUTPATH = "wntgcci"; @@ -536,13 +540,20 @@ $INPATH = $OUTPATH.$PROEXT; $GVERDIR = $INPATH; $COMEX = '@COMEX@'; - if ( "@COMEX@" eq "8" ) - { # .NET needs M1300 - $CVER = "M1300"; + if ( "@COMEX@" eq "10" ) + { # .NET 2003 needs M1310 + $CVER = "M1310"; } else - { # keep the historical value for MSVC 6 - $CVER = "MI200"; + { + if ( "@COMEX@" eq "8" ) + { # .NET needs M1300 + $CVER = "M1300"; + } + else + { # keep the historical value for MSVC 6 + $CVER = "MI200"; + } } if ( "@USE_SHELL@" ne "4nt" ) @@ -956,11 +967,24 @@ elsif ($platform eq "$Winnt") { $SOLARINCLUDES = $I.$SOLARVER.$INC. $I.$SOLARENV.$ds.$INPATH.$INC. - $I.$SOLARENV.$INC. - $I."'".$PSDK_HOME.$INCLUDE."'"; + $I.$SOLARENV.$INC; # Mingw is different if ( $COM eq "MSC" ) + { $SOLARINCLUDES .= $I."'".$PSDK_HOME.$INCLUDE."'". + $I.'$COMPATH'.$ds."include"; + } + else { $SOLARINCLUDES .= $I.'$COMPATH'.$ds."include"; + %lib_include_paths = split( / /, "@LIB_INCLUDE_PATH@" ); + foreach $lib_include_path (%lib_include_paths) + { chomp( $lib_include_path = qx{cygpath $lib_include_path} ); + if ( $lib_include_path ne $COMPATH.$ds."include" ) + { + $SOLARINCLUDES .= $I.$lib_include_path; + } + } + $SOLARINCLUDES .= $I.$GXX_INCLUDE_PATH.$I.$GXX_INCLUDE_PATH.$ds."mingw32". + $I."'".$PSDK_HOME.$INCLUDE."'"; } } elsif ($platform eq "$Macosx") @@ -982,20 +1006,36 @@ $IENV = $cur_dir. $ps.$SOLARVER.$ds.$UPD.$ds.$INPATH.$INC. $ps.$SOLARENV.$ds.$OUTPATH.$INC. - $ps.$SOLARENV.$INC. - $ps.'$PSDK_HOME'.$INCLUDE; + $ps.$SOLARENV.$INC; # Mingw is different if ( $COM eq "MSC" ) + { $IENV .= $ps.'$PSDK_HOME'.$INCLUDE. + $ps.'$COMPATH'.$INCLUDE; + } + else { $IENV .= $ps.'$COMPATH'.$INCLUDE; + %lib_include_paths = split( / /, "@LIB_INCLUDE_PATH@" ); + foreach $lib_include_path (%lib_include_paths) + { chomp( $lib_include_path = qx{cygpath $lib_include_path} ); + if ( $lib_include_path ne $COMPATH.$ds."include" ) + { + $IENV .= $ps.$lib_include_path; + } + } + $IENV .= $ps.$GXX_INCLUDE_PATH.$ps.$GXX_INCLUDE_PATH.$ds."mingw32". + $ps.'$PSDK_HOME'.$INCLUDE; } $WIN_LIB = $cur_dir.$ps_STLPORT_LIB.$ps. $ps.$SOLARVER.$ds.$UPD.$LIB. $ps.$SOLARVER.$ds.$UPD.$ds.$INPATH.$LIB. $ps.$SOLARENV.$ds.$OUTPATH.$LIB. - $ps.$JAVA_HOME.$LIB. - $ps.'$PSDK_HOME'.$LIB; + $ps.$JAVA_HOME.$LIB; # Mingw is different if ( $COM eq "MSC" ) + { $WIN_LIB .= $ps.'$PSDK_HOME'.$LIB. + $ps.'$COMPATH'.$LIB; + } + else { $WIN_LIB .= $ps.'$COMPATH'.$LIB; } if ( $JAVA_HOME ne "" ) @@ -1081,7 +1121,7 @@ if ( $COM eq "MSC" ) { $PATH .= $ps.'$COMPATH'.$BIN; } else { - $PATH .= $ps.'$COMPATH'; + $PATH .= $ps.'$COMPATH'.$BIN; } } if ( $COM eq "MSC" ) { @@ -1092,7 +1132,7 @@ if ( $noldPATH !~ /(?:[:]|\A)(?:$MSPDB_PATH)(?:[:]|\Z)/ ) { $PATH .= $ps.$MSPDB_PATH; } - if ( $COMEX eq "8" ) { + if ( $COMEX eq "8" || $COMEX eq "10" ) { # .NET needs midl.exe if ( $noldPATH !~ /(?:[:]|\A)(?:$MIDL_PATH)(?:[:]|\Z)/ ) { $PATH .= $ps.$MIDL_PATH; @@ -1281,11 +1321,24 @@ elsif ($platform eq "$Winnt") { $SOLARINC .= $STLPORT_stlport. $I.'$JAVA_HOME'.$ds."include".$ds."win32". - $I.'$JAVA_HOME'.$ds."include". - $I."'".$PSDK_HOME.$INCLUDE."'"; + $I.'$JAVA_HOME'.$ds."include"; # Mingw is different if ( $COM eq "MSC" ) + { $SOLARINC .= $I."'".$PSDK_HOME.$INCLUDE."'". + $I.'$COMPATH'.$ds."include"; + } + else { $SOLARINC .= $I.'$COMPATH'.$ds."include"; + %lib_include_paths = split( / /, "@LIB_INCLUDE_PATH@" ); + foreach $lib_include_path (%lib_include_paths) + { chomp( $lib_include_path = qx{cygpath $lib_include_path} ); + if ( $lib_include_path ne $COMPATH.$ds."include" ) + { + $SOLARINC .= $I.$lib_include_path; + } + } + $SOLARINC .= $I.$GXX_INCLUDE_PATH.$I.$GXX_INCLUDE_PATH.$ds."mingw32". + $I."'".$PSDK_HOME.$INCLUDE."'"; } } elsif ($platform eq "$Macosx") @@ -1713,7 +1766,7 @@ ToFile( "WITH_LIBSN", "@WITH_LIBSN@", "e" ); ToFile( "LIBSN_CFLAGS", "@LIBSN_CFLAGS@", "e" ); ToFile( "LIBSN_LIBS", "@LIBSN_LIBS@", "e" ); -ToFile( "GXX_INCLUDE_PATH", "@GXX_INCLUDE_PATH@", "e" ); +ToFile( "GXX_INCLUDE_PATH", $GXX_INCLUDE_PATH, "e" ); ToFile( "COMMON_BUILD_TOOLS",$COMMON_BUILD_TOOLS, "e" ); if ($platform ne "$Winnt") { ToFile( "TEMP", $TEMP, "e" ); @@ -2041,9 +2094,23 @@ { # Write an environment variable to file. if (defined $_[ 1 ]) { printf("%-12s %-17s %-10s %s\n", "The variable", $_[ 0 ], "is set to:", $_[ 1 ]) ; # to stdout - print OUT "$setenv $_[ 0 ] \"$_[ 1 ]\"$newline"; # to tcsh file + if ($platform eq "$Winnt" && $COM ne "MSC" ) + { $mingw_format_var = MingWCygwinFormat( $_[ 0 ] , $_[ 1 ] ); + print OUT "$setenv $_[ 0 ] \"$mingw_format_var\"$newline"; # to tcsh file + } + else + { + print OUT "$setenv $_[ 0 ] \"$_[ 1 ]\"$newline"; # to tcsh file + } if(defined($outfile_sh)) - { print OUT_SH "$_[ 0 ]=\"$_[ 1 ]\"$newline"; # to sh file + { + if ($platform eq "$Winnt" && $_[ 0 ] ne "PATH" && $COM ne "MSC" ) + { print OUT_SH "$_[ 0 ]=\"$mingw_format_var\"$newline"; # to sh file + } + else + { + print OUT_SH "$_[ 0 ]=\"$_[ 1 ]\"$newline"; # to sh file + } $exportvars .= " $_[ 0 ]"; # add to export list for sh file } if(defined($outfile_bat)) @@ -2115,6 +2182,12 @@ { if ((defined $_[ 1 ]) and ( $platform eq "$Winnt" )) { printf("%-12s %-17s %-10s %-39s\n", "The variable", $_[ 0 ], "is set to:", $_[ 1 ]) ; # to stdout + if ($_[ 0 ] eq "ILIB" && $COM ne "MSC") + { $mingw_format_var = MingWCygwinFormat( $_[ 0 ] , $_[ 1 ] ); + print OUT "$setenv $_[ 0 ] \"$mingw_format_var\"$newline"; # to tcsh file + } + else + { $win_format_var = WinFormat( $_[ 1 ] ); #Filter for Windows $win_format_var =~ s/\\/\\\\/g; print OUT "$setenv $_[ 0 ] \"$win_format_var\" $newline"; @@ -2124,6 +2197,7 @@ print OUT_BAT "IF DEFINED $_[ 0 ] $unset $_[ 0 ] $newline"; print OUT_BAT "$set $_[ 0 ]=$win_format_var $newline"; } + } } else { @@ -2201,7 +2275,7 @@ foreach $d1 ( @split_var ) { $d1 = "-".$d1; - if ( $d1 =~ /^(-\w)[\'\"]?((?:\/[\w\.~ ]+)+)[\'\"]?/ ) + if ( $d1 =~ /^(-\w)[\'\"]?((?:\/[-\+\w\.-~ ]+)+)[\'\"]?/ ) # This regex: option -> $1, filename without quotes -> $2 { $d1_prefix = $1; @@ -2230,7 +2304,7 @@ @split_var = split(/;/,$variable); foreach $d1 ( @split_var ) { - if ( $d1 =~ /(?:^\/[\w\.~ ]+)+/ ) + if ( $d1 =~ /(?:^\/[-\+\w\.~ ]+)+/ ) { if ( $d1 =~ / / ) { @@ -2253,6 +2327,105 @@ return $variable; } #---------------------------------------------------------- +# Function name: MingWCygwinFormat +# Description: Format variables to Windows Format. +# Arguments: 1. Variable (string) +# Return value: Reformatted String +#---------------------------------------------------------- +sub MingWCygwinFormat +{ my ( $name, $variable, $d1, $d1_prefix, $d1_fname, @split_var ); + $name = $_[ 0 ]; + $variable = $_[ 1 ]; + $variable =~ s/^\s+//g ; #remove leading spaces + $variable =~ s/\s+$//g ; #remove trailing spaces + if ( ( $name ne "COMPATH" ) && ( $name ne "SOLARINC" ) && ( $name ne "GXX_INCLUDE_PATH" ) && + ( $name ne "SOLARVERSION" ) && ( $name ne "ILIB" ) ) + { + return $variable; + } + # Here should be NO "\"! If yes, PosixFormat() was forgotten before ! + if ( $variable =~ /\\/ ) + { + die("Error! Variable contains \"\\\" : $variable PosixFormat() missing?"); + } + $variable =~ s/\$\{PATH\}/%PATH/g ; # explicit replace ${PATH} + $variable =~ s/(\$\{?\w+\}?)/$1/eeg ; # expand the variables + $variable =~ s/(\$\{?\w+\}?)/$1/eeg ; # expand the variables twice! + $variable =~ s/:+/:/g ; # remove multiple ; + + if ( $cygwinver eq "b" ) + { + $variable =~ s{//([c-z])/}{$1:\\}gi; # drives from cgywin-b20 (just in case ...) + $variable =~ s{/cygdrive/([c-z])/}{$1:/}gi; # more drives for cgywin-b20 + $variable =~ s!([;]|\A|-[iIlL])/!$1$SYSTEMDRIVE/!g; # get back the hidden drives + } + else # New cygwin + { + # Search for posix path entry and replace with cygpath -w entry ( -d if filename contains space ) + if ( $variable =~ /^\s*-\w/ ) + { + # Include paths + @split_var = split(/\s+-/,$variable); + $split_var[0] =~ s/^-//; # split deletes the "-" from all but the first element + foreach $d1 ( @split_var ) + { + $d1 = "-".$d1; + if ( $d1 =~ /^(-\w)[\'\"]?((?:\/[-\+\w\.~ ]+)+)[\'\"]?/ ) + # This regex: option -> $1, filename without quotes -> $2 + { + $d1_prefix = $1; + $d1_fname = $2; + if ( $d1_fname =~ / / ) + { + chomp( $d1_fname = qx{cygpath -m -s "$d1_fname"} ); # Use DOS 8.3 style to avoid quoting + } # ! This fails when $d1 doesn't exist! + else + { + chomp( $d1_fname = qx{cygpath -m "$d1_fname"} ); # Use "normal" filenames + } + $d1 = $d1_prefix.$d1_fname; + } + else + { # relative paths here + # Do nothing. + } + } + $variable = join(' ',@split_var); + } + elsif ( $variable eq ";" ) {} + else + { + # Normal paths + @split_var = split(/:/,$variable); + foreach $d1 ( @split_var ) + { + if ( $d1 =~ /(?:^\/[-\+\w\.~ ]+)+/ ) + { + if ( $d1 =~ / / ) + { + chomp( $d1 = qx{cygpath -m -s "$d1"} ); # Use DOS 8.3 style to avoid quoting + } # ! This fails when $d1 doesn't exist! + else + { + chomp( $d1 = qx{cygpath -m "$d1"} ); # Use "normal" filenames + } + } + else + { # relative paths here + # Do nothing. + } + } + $variable = join(';',@split_var); + } + } + if ( $name eq "PATH" ) + { + $variable = PosixFormat($variable); + return $variable; + } + return $variable; +} +#---------------------------------------------------------- # Function name: CheckBuildEnv # Description: Checks whether the build environment # exists on the system. --- ./config_office/configure.orig 2003-08-15 20:32:58.000000000 +0900 +++ ./config_office/configure 2003-11-02 20:05:04.000000000 +0900 @@ -271,7 +271,7 @@ PACKAGE_STRING= PACKAGE_BUGREPORT= -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS AWK SED PTHREAD_CFLAGS PTHREAD_LIBS ENABLE_CRASHDUMP ENABLE_DEBUG ENABLE_SYMBOLS USE_SHELL CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT COMPATH USE_GCC3 GNUMAKE _cc MSPDB_PATH COMEX MIDL_PATH WDEVENV_PATH CPP EGREP CXX CXXFLAGS ac_ct_CXX GXX_INCLUDE_PATH EXCEPTIONS CXXCPP STLPORT4 SOLAR_JAVA JAVAC JAVA JAVA_HOME JDK XMKMF PERL TCSH PKG_CONFIG GTK_CFLAGS GTK_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS XINC XLIB PSDK_HOME BISON FLEX PATCH GNUPATCH GNUCP CYGWIN ML_EXE ASM_HOME ZIP ZIP_HOME LIBART_CFLAGS LIBART_LIBS WITH_LIBART WITH_GPC LIBSN_CFLAGS LIBSN_LIBS WITH_LIBSN ANT ANT_HOME UPD LOCAL_SOLENV LOCAL_SOLVER WITH_LANG WITH_DICT ENABLE_STATIC_GTK GCC_HOME WITH_MINGWIN OSVERSION LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS AWK SED PTHREAD_CFLAGS PTHREAD_LIBS ENABLE_CRASHDUMP ENABLE_DEBUG ENABLE_SYMBOLS USE_SHELL CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT COMPATH USE_GCC3 GNUMAKE _cc MSPDB_PATH COMEX MIDL_PATH WDEVENV_PATH CPP EGREP CXX CXXFLAGS ac_ct_CXX GXX_INCLUDE_PATH EXCEPTIONS CXXCPP STLPORT4 SOLAR_JAVA JAVAC JAVA JAVA_HOME JDK XMKMF PERL TCSH PKG_CONFIG GTK_CFLAGS GTK_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS XINC XLIB PSDK_HOME BISON FLEX PATCH GNUPATCH GNUCP CYGWIN ML_EXE ASM_HOME ZIP ZIP_HOME LIBART_CFLAGS LIBART_LIBS WITH_LIBART WITH_GPC LIBSN_CFLAGS LIBSN_LIBS WITH_LIBSN ANT ANT_HOME UPD LOCAL_SOLENV LOCAL_SOLVER WITH_LANG WITH_DICT ENABLE_STATIC_GTK GCC_HOME WITH_MINGWIN OSVERSION LIBOBJS LTLIBOBJS LIB_INCLUDE_PATH' ac_subst_files='' # Initialize some variables set by options. @@ -913,9 +913,9 @@ Usage: --with-cl-home= --with-mspdb-path For Microsoft C/C++ compiler users, please supply the path - pointing to the mspdb60.dll (MSVC 6) or mspdb60.dll (.NET). + pointing to the mspdb60.dll (MSVC 6) or mspdb7x.dll (.NET). - Usage: --with-mspdb-path= + Usage: --with-mspdb-path= --with-midl-path For Microsoft C/C++ .NET compiler users, please supply the path pointing to the midl.exe. @@ -3177,6 +3177,55 @@ if test "$WITH_MINGWIN" != "yes"; then echo "$as_me:$LINENO: checking the Microsoft C/C++ Compiler" >&5 echo $ECHO_N "checking the Microsoft C/C++ Compiler... $ECHO_C" >&6 + # Extract the first word of "mspdb71.dll", so it can be a program name with args. +set dummy mspdb71.dll; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_MSPDB_PATH+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $MSPDB_PATH in + [\\/]* | ?:[\\/]*) + ac_cv_path_MSPDB_PATH="$MSPDB_PATH" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_MSPDB_PATH="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + + ;; +esac +fi +MSPDB_PATH=$ac_cv_path_MSPDB_PATH + +if test -n "$MSPDB_PATH"; then + echo "$as_me:$LINENO: result: $MSPDB_PATH" >&5 +echo "${ECHO_T}$MSPDB_PATH" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + if test -n "$MSPDB_PATH";then + MSPDB_PATH=`dirname $MSPDB_PATH` + fi + if test -e "$with_mspdb_path/mspdb71.dll"; then + MSPDB_PATH="$with_mspdb_path" + fi + if test -z "$MSPDB_PATH" -a -e "$with_cl_home/../Common7/IDE/mspdb71.dll"; then + MSPDB_PATH="$with_cl_home/../Common7/IDE" + fi + if test -z "$MSPDB_PATH"; then # Extract the first word of "mspdb70.dll", so it can be a program name with args. set dummy mspdb70.dll; ac_word=$2 echo "$as_me:$LINENO: checking for $ac_word" >&5 @@ -3280,6 +3329,7 @@ echo "$as_me: error: You need a mspdb?0.dll, make sure it's in the path or use --with-mspdb-path" >&2;} { (exit 1); exit 1; }; } fi + fi MSPDB_PATH=`cygpath -d "$MSPDB_PATH"` MSPDB_PATH=`cygpath -u "$MSPDB_PATH"` PATH="$MSPDB_PATH:$PATH" @@ -3353,19 +3403,23 @@ }"` echo "$as_me:$LINENO: result: found Compiler version $CCNUMVER." >&5 echo "${ECHO_T}found Compiler version $CCNUMVER." >&6 - if test $CCNUMVER -ge "001300000000"; then - COMEX=8 + if test $CCNUMVER -ge "001300100000"; then + COMEX=10 else - if test $CCNUMVER -ge "001200000000"; then - if test "$with_old_psdk" != "yes"; then - COMEX=9 + if test $CCNUMVER -ge "001300000000"; then + COMEX=8 + else + if test $CCNUMVER -ge "001200000000"; then + if test "$with_old_psdk" != "yes"; then + COMEX=9 + else + COMEX=7 + fi else - COMEX=7 + { { echo "$as_me:$LINENO: error: Compiler too old." >&5 + echo "$as_me: error: Compiler too old." >&2;} + { (exit 1); exit 1; }; } fi - else - { { echo "$as_me:$LINENO: error: Compiler too old." >&5 -echo "$as_me: error: Compiler too old." >&2;} - { (exit 1); exit 1; }; } fi fi else @@ -3376,7 +3430,7 @@ else echo "$as_me:$LINENO: checking the Mingwin32 C++ Compiler" >&5 echo $ECHO_N "checking the Mingwin32 C++ Compiler... $ECHO_C" >&6 - if test `$CC -dumpmachine | $AWK -F- '{ print $3 }'` = "mingw32"; then + if test `$CC -dumpmachine | $AWK -F- '{ print $1 }'` = "mingw32"; then echo "$as_me:$LINENO: result: found." >&5 echo "${ECHO_T}found." >&6 else @@ -3389,7 +3443,7 @@ -if test "$COMEX" = "8"; then +if test "$COMEX" = "8" -o "$COMEX" = "10" ; then # Extract the first word of "midl.exe", so it can be a program name with args. set dummy midl.exe; ac_word=$2 echo "$as_me:$LINENO: checking for $ac_word" >&5 @@ -3432,13 +3486,13 @@ if test -n "$MIDL_PATH";then MIDL_PATH=`dirname $MIDL_PATH` fi - if test -x "$with_midl_path/midl.exe"; then + if test -e "$with_midl_path/midl.exe"; then MIDL_PATH="$with_midl_path" fi if test -z "$MIDL_PATH" -a -e "$with_cl_home/../Common7/Tools/Bin/midl.exe"; then MIDL_PATH="$with_cl_home/../Common7/Tools/Bin" fi - if test ! -x "$MIDL_PATH/midl.exe"; then + if test ! -e "$MIDL_PATH/midl.exe"; then { { echo "$as_me:$LINENO: error: midl.exe not found. Make sure it's in the path or use --with-midl-path" >&5 echo "$as_me: error: midl.exe not found. Make sure it's in the path or use --with-midl-path" >&2;} { (exit 1); exit 1; }; } @@ -4287,6 +4341,12 @@ fi GXX_INCLUDE_PATH="$_gxx_include_path" +if test "$_os" != "WINNT" -o "$WITH_MINGWIN" = "yes"; then + _lib_include_path=`echo "#include " | $CC -E - | $SED -n '/.*1*"\(.*\)\/stddef.h".*/s//\1/p' | sort -u | xargs echo` +else + _lib_include_path="NO_LIB_INCLUDE" +fi +LIB_INCLUDE_PATH="$_lib_include_path" if test "$_os" = "SunOS"; then if test "$CC" = "cc"; then @@ -7638,6 +7698,28 @@ fi +if test "$_os" = "WINNT" -a "$COMEX" = "10"; then + echo "$as_me:$LINENO: checking msvcp71.dll" >&5 +echo $ECHO_N "checking msvcp71.dll... $ECHO_C" >&6 + if test -f ../external/msvcp71/msvcp71.dll; then + echo "$as_me:$LINENO: result: found" >&5 +echo "${ECHO_T}found" >&6 + else + { { echo "$as_me:$LINENO: error: The msvcp71.dll is missing in external/msvcp71/. +The dll is part of the .NET installation and can be found in a directory +similar to: +\"c:\\Program Files\\Microsoft Visual Studio .NET\\Visual C++ .NET Professional - English\\\" +Please copy the file to external/msvcp71." >&5 +echo "$as_me: error: The msvcp71.dll is missing in external/msvcp71/. +The dll is part of the .NET installation and can be found in a directory +similar to: +\"c:\\Program Files\\Microsoft Visual Studio .NET\\Visual C++ .NET Professional - English\\\" +Please copy the file to external/msvcp71." >&2;} + { (exit 1); exit 1; }; } + fi +fi + + WITH_GPC=NO WITH_LIBART=NO @@ -8803,6 +8885,7 @@ s,@OSVERSION@,$OSVERSION,;t t s,@LIBOBJS@,$LIBOBJS,;t t s,@LTLIBOBJS@,$LTLIBOBJS,;t t +s,@LIB_INCLUDE_PATH@,$LIB_INCLUDE_PATH,;t t CEOF _ACEOF --- ./xml2cmp/source/xcd/parse.cxx.orig 2003-04-16 03:43:40.000000000 +0900 +++ ./xml2cmp/source/xcd/parse.cxx 2003-11-17 00:38:58.000000000 +0900 @@ -274,7 +274,8 @@ Get_Attribute(sAttrValue, sAttrName); - for ( unsigned i = 0; i < nSize; ++i ) + unsigned i = 0; + for ( ; i < nSize; ++i ) { if ( i_rAttrNames[i] == sAttrName ) { @@ -366,7 +367,8 @@ { char * pResult = &sWord[0]; - for ( char * pSet = pResult; + char * pSet = pResult; + for ( ; *text != i_cEnd; ++text ) { @@ -383,7 +385,7 @@ if (i_bReverseName) { - const nMaxLen = 1000; + const int nMaxLen = 1000; if (strlen(pResult) < nMaxLen) { char * sBreak = strrchr(pResult,'.'); --- ./xml2cmp/source/support/badcast.cxx.orig 2002-12-11 23:36:26.000000000 +0900 +++ ./xml2cmp/source/support/badcast.cxx 2003-11-17 00:43:08.000000000 +0900 @@ -65,7 +65,7 @@ due to problems with WNT-STL-headers. */ -#ifdef WNT +#if defined(WNT) && !defined(__MINGW32__) #define _NTSDK #include --- ./dmake/win95/microsft/Makefile.in.orig 2003-03-25 23:02:54.000000000 +0900 +++ ./dmake/win95/microsft/Makefile.in 2003-10-05 01:37:46.000000000 +0900 @@ -118,7 +118,7 @@ libmsft_a_SOURCES = ruletab.c -INCLUDES = -I$(top_srcdir) -I$(top_builddir) -I.. +INCLUDES = -I$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/@OS_TYPE@/@OS_VERSION@ -I.. subdir = win95/microsft mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h --- ./dmake/configure.orig 2003-03-25 23:02:10.000000000 +0900 +++ ./dmake/configure 2003-10-04 08:35:30.000000000 +0900 @@ -5666,7 +5666,7 @@ if test `echo $_os | $AWK -F_ '{ print $1 }'` = "CYGWIN"; then if test "$GCC" = "yes"; then - if test `$CC -dumpmachine | $AWK -F- '{ print $3 }'` = "mingw32"; then + if test `$CC -dumpmachine | $AWK -F- '{ print $1 }'` = "mingw32"; then _os="MINGW" else _os="CYGWIN" --- ./scaddins/prj/d.lst.orig 2003-05-28 00:44:44.000000000 +0900 +++ ./scaddins/prj/d.lst 2004-01-13 00:09:12.000000000 +0900 @@ -1,6 +1,7 @@ ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll ..\%__SRC%\class\*.jar %_DEST%\bin%_EXT%\*.jar ..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT% +..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT% ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib ..\%__SRC%\lib\*.sl %_DEST%\lib%_EXT%\*.sl ..\%__SRC%\bin\*.bin %_DEST%\bin%_EXT%\*.bin --- ./sal/systools/win32/uwinapi/FindFirstVolumeA.cpp.orig 2003-04-09 00:51:24.000000000 +0900 +++ ./sal/systools/win32/uwinapi/FindFirstVolumeA.cpp 2003-11-29 16:22:54.000000000 +0900 @@ -61,4 +61,8 @@ #include "macros.h" -DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, HANDLE, WINAPI, FindFirstVolumeA, (LPSTR lpszVolumeName, DWORD cchBufferLength) ) \ No newline at end of file +#ifdef __MINGW32__ +DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, HANDLE, WINAPI, FindFirstVolumeA, (LPCSTR lpszVolumeName, DWORD cchBufferLength) ) +#else +DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, HANDLE, WINAPI, FindFirstVolumeA, (LPSTR lpszVolumeName, DWORD cchBufferLength) ) +#endif --- ./sal/systools/win32/uwinapi/FindFirstVolumeW.cpp.orig 2003-04-09 00:51:50.000000000 +0900 +++ ./sal/systools/win32/uwinapi/FindFirstVolumeW.cpp 2003-11-29 16:24:16.000000000 +0900 @@ -61,4 +61,8 @@ #include "macros.h" -DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, HANDLE, WINAPI, FindFirstVolumeW, (LPWSTR lpszVolumeName, DWORD cchBufferLength) ) \ No newline at end of file +#ifdef __MINGW32__ +DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, HANDLE, WINAPI, FindFirstVolumeW, (LPCWSTR lpszVolumeName, DWORD cchBufferLength) ) +#else +DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, HANDLE, WINAPI, FindFirstVolumeW, (LPWSTR lpszVolumeName, DWORD cchBufferLength) ) +#endif --- ./sal/systools/win32/uwinapi/FindNextVolumeA.cpp.orig 2003-04-09 00:52:00.000000000 +0900 +++ ./sal/systools/win32/uwinapi/FindNextVolumeA.cpp 2003-11-29 16:25:54.000000000 +0900 @@ -61,4 +61,8 @@ #include "macros.h" -DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, BOOL, WINAPI, FindNextVolumeA, (HANDLE hFindVolume, LPSTR lpszVolumeName, DWORD cchBufferLength) ) \ No newline at end of file +#ifdef __MINGW32__ +DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, BOOL, WINAPI, FindNextVolumeA, (HANDLE hFindVolume, LPCSTR lpszVolumeName, DWORD cchBufferLength) ) +#else +DEFINE_DEFAULT_THUNK( kernel32, TRYLOAD, BOOL, WINAPI, FindNextVolumeA, (HANDLE hFindVolume, LPSTR lpszVolumeName, DWORD cchBufferLength) ) +#endif --- ./sal/systools/win32/uwinapi/GetProcessId.cpp.orig 2003-03-27 01:46:48.000000000 +0900 +++ ./sal/systools/win32/uwinapi/GetProcessId.cpp 2003-11-27 20:00:46.000000000 +0900 @@ -105,7 +105,11 @@ typedef DWORD (WINAPI OBFUSCATE)( DWORD dwPTID ); typedef OBFUSCATE *LPOBFUSCATE; +#ifdef __MINGW32__ +static OBFUSCATE Obfuscate; +#else OBFUSCATE Obfuscate; +#endif static DWORD WINAPI Obfuscate( DWORD dwPTID ) { --- ./sal/systools/win32/uwinapi/macros.h.orig 2003-06-12 18:47:18.000000000 +0900 +++ ./sal/systools/win32/uwinapi/macros.h 2003-11-27 01:11:18.000000000 +0900 @@ -132,6 +132,31 @@ +#ifdef __MINGW32__ +#define IMPLEMENT_THUNK( module, resolve, rettype, calltype, func, params ) \ +static void func##_Thunk(); \ +EXTERN_C _declspec( dllexport ) FARPROC module##_##func##_Ptr = (FARPROC)func##_Thunk; \ +EXTERN_C rettype calltype func params \ +{ \ + asm(" popl %ebp"); \ + asm(" jmp (%0)"::"m"(module##_##func##_Ptr)); \ +} \ +EXTERN_C rettype calltype func##_##resolve params; \ +static rettype calltype func##_##Failure params; \ +static void func##_Thunk() \ +{ \ + ResolveThunk_##resolve( &module##_##func##_Ptr, #module ".dll", #func, (FARPROC)func##_##resolve, (FARPROC)func##_##Failure ); \ + asm(" movl %ebp, %esp"); \ + asm(" popl %ebp"); \ + asm(" jmp (%0)"::"m"(module##_##func##_Ptr)); \ +} \ +static rettype calltype func##_##Failure params \ +{ \ + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); \ + return (rettype)0; \ +} \ +EXTERN_C rettype calltype func##_##resolve params +#else #define IMPLEMENT_THUNK( module, resolve, rettype, calltype, func, params ) \ EXTERN_C _declspec( dllexport ) FARPROC module##_##func##_Ptr; \ EXTERN_C rettype calltype func##_##resolve params; \ @@ -152,9 +177,27 @@ return (rettype)0; \ } \ EXTERN_C rettype calltype func##_##resolve params +#endif +#ifdef __MINGW32__ +#define DEFINE_CUSTOM_THUNK( module, resolve, rettype, calltype, func, params ) \ +static void func##_Thunk(); \ +EXTERN_C _declspec( dllexport ) FARPROC module##_##func##_Ptr = (FARPROC)func##_Thunk; \ +static void func##_Thunk() \ +{ \ + ResolveThunk_##resolve( &module##_##func##_Ptr, #module ".dll", #func ); \ + asm(" movl %ebp, %esp"); \ + asm(" popl %ebp"); \ + asm(" jmp (%0)"::"m"(module##_##func##_Ptr)); \ +} \ +EXTERN_C rettype calltype func params \ +{ \ + asm(" popl %ebp"); \ + asm(" jmp (%0)"::"m"(module##_##func##_Ptr)); \ +} +#else #define DEFINE_CUSTOM_THUNK( module, resolve, rettype, calltype, func, params ) \ EXTERN_C _declspec( dllexport ) FARPROC module##_##func##_Ptr; \ static _declspec ( naked ) void func##_Thunk() \ @@ -167,9 +210,32 @@ _asm jmp [module##_##func##_Ptr] \ } \ EXTERN_C _declspec( dllexport ) FARPROC module##_##func##_Ptr = (FARPROC)func##_Thunk; +#endif - +#ifdef __MINGW32__ +#define DEFINE_DEFAULT_THUNK( module, resolve, rettype, calltype, func, params ) \ +static void func##_Thunk(); \ +EXTERN_C _declspec( dllexport ) FARPROC module##_##func##_Ptr = (FARPROC)func##_Thunk; \ +static rettype calltype func##_##Failure params; \ +static _declspec ( naked ) void func##_Thunk() \ +{ \ + ResolveThunk_##resolve( &module##_##func##_Ptr, #module ".dll", #func, NULL, (FARPROC)func##_##Failure ); \ + asm(" movl %ebp, %esp"); \ + asm(" popl %ebp"); \ + asm(" jmp (%0)"::"m"(module##_##func##_Ptr)); \ +} \ +EXTERN_C _declspec( naked ) rettype calltype func params \ +{ \ + asm(" popl %ebp"); \ + asm(" jmp (%0)"::"m"(module##_##func##_Ptr)); \ +} \ +static rettype calltype func##_##Failure params \ +{ \ + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); \ + return (rettype)0; \ +} +#else #define DEFINE_DEFAULT_THUNK( module, resolve, rettype, calltype, func, params ) \ EXTERN_C _declspec( dllexport ) FARPROC module##_##func##_Ptr; \ static rettype calltype func##_##Failure params; \ @@ -188,4 +254,5 @@ SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); \ return (rettype)0; \ } +#endif --- ./sal/systools/win32/uwinapi/uwinapi.dxp.orig 2003-04-09 00:54:18.000000000 +0900 +++ ./sal/systools/win32/uwinapi/uwinapi.dxp 2003-12-14 00:53:34.000000000 +0900 @@ -105,3 +105,7 @@ GetVolumePathNameW SetVolumeMountPointA SetVolumeMountPointW +snprintf +snwprintf +vsnprintf +vsnwprintf --- ./sal/systools/win32/uwinapi/sntprintf.c.orig 2002-12-11 01:16:44.000000000 +0900 +++ ./sal/systools/win32/uwinapi/sntprintf.c 2003-11-27 22:26:42.000000000 +0900 @@ -11,8 +11,11 @@ /* The non-debug versions of _vscprintf/_scprintf are just calls to _vsprintf/_sprintf with string buffer pointer set to NULL, requires MSVCRT version 7.0 */ - +#ifdef __MINGW32__ +static int __cdecl _vsctprintf( const TCHAR *format, va_list ap ) +#else static int __cdecl _vsctprintf( const _TXCHAR *format, va_list ap ) +#endif { FILE *fp = _tfopen( _T("NUL"), _T("wb") ); --- ./sal/systools/win32/guistdio/guistdio.cxx.orig 2003-05-29 00:56:48.000000000 +0900 +++ ./sal/systools/win32/guistdio/guistdio.cxx 2003-12-13 12:29:04.000000000 +0900 @@ -169,7 +169,11 @@ //--------------------------------------------------------------------------- +#ifdef __MINGW32__ +int main( int argc, char **argv ) +#else int _tmain( int argc, _TCHAR **argv ) +#endif { TCHAR szTargetFileName[MAX_PATH] = TEXT(""); STARTUPINFO aStartupInfo; --- ./sal/rtl/source/uuid.cxx.orig 2002-11-14 19:40:14.000000000 +0900 +++ ./sal/rtl/source/uuid.cxx 2003-11-19 21:35:00.000000000 +0900 @@ -130,7 +130,11 @@ nTime = ((sal_uInt64) val.Seconds) *((sal_uInt64)10000000) + ((sal_uInt64) val.Nanosec) /100 + +#ifdef __MINGW32__ + (sal_uInt64)(0x01B21DD213814000ULL); +#else (sal_uInt64)(0x01B21DD213814000); +#endif return nTime; } @@ -253,7 +257,11 @@ ((sal_uInt16) uuid.clock_seq_low ); memcpy( pNode, &( uuid.node ) , 6 ); +#ifdef __MINGW32__ + *pTime = *pTime & 0x0fffffffffffffffULL; +#else *pTime = *pTime & 0x0fffffffffffffff; +#endif *pClockSeq = *pClockSeq & 0x3fff; } @@ -266,7 +274,11 @@ UUID uuid; /* 1 0123456789012345 */ +#ifdef __MINGW32__ + nTime = ( nTime & 0x0fffffffffffffffULL ) | 0x1000000000000000ULL; +#else nTime = ( nTime & 0x0fffffffffffffff ) | 0x1000000000000000; +#endif nClockSeq = ( nClockSeq & 0x3fff ) | 0x8000; uuid.time_low = (sal_uInt32) ( nTime & 0xffffffff ); --- ./sal/osl/w32/path_helper.cxx.orig 2003-04-09 00:50:32.000000000 +0900 +++ ./sal/osl/w32/path_helper.cxx 2003-12-27 00:19:28.000000000 +0900 @@ -132,18 +132,32 @@ ******************************************************************/ // is [A-Za-z]:[/|\]\0 +#ifdef __MINGW32__ +const wchar_t* LDP = L":"; +const wchar_t* LDP_WITH_BACKSLASH = L":\\"; +const wchar_t* LDP_WITH_SLASH = L":/"; +#else const sal_Unicode* LDP = L":"; const sal_Unicode* LDP_WITH_BACKSLASH = L":\\"; const sal_Unicode* LDP_WITH_SLASH = L":/"; +#endif // degenerated case returned by the Windows FileOpen dialog // when someone enters for instance "x:filename", the Win32 // API accepts this case +#ifdef __MINGW32__ +const wchar_t* LDP_WITH_DOT_BACKSLASH = L":.\\"; +#else const sal_Unicode* LDP_WITH_DOT_BACKSLASH = L":.\\"; +#endif sal_Int32 osl_systemPathIsLogicalDrivePattern(/*in*/ const rtl_uString* pustrPath) { +#ifdef __MINGW32__ + const wchar_t* p = reinterpret_cast< const wchar_t * >(rtl_uString_getStr(const_cast(pustrPath))); +#else const sal_Unicode* p = rtl_uString_getStr(const_cast(pustrPath)); +#endif if (iswalpha(*p++)) { return ((0 == wcscmp(p, LDP)) || --- ./sal/osl/w32/system.h.orig 2003-04-16 02:45:36.000000000 +0900 +++ ./sal/osl/w32/system.h 2003-11-18 22:16:46.000000000 +0900 @@ -97,6 +97,10 @@ // at the same time without patching // windows.h #include +#ifdef __MINGW32__ + #include + #include +#endif #else // winsock2.h includes windows.h #include --- ./sal/osl/w32/tempfile.c.orig 2002-11-14 17:36:50.000000000 +0900 +++ ./sal/osl/w32/tempfile.c 2003-11-19 21:01:20.000000000 +0900 @@ -87,11 +87,13 @@ oslFileError MapWindowsErrorToOSLError( DWORD dwError ); +#ifndef __MINGW32__ /* Allocate n number of t's on the stack return a pointer to it in p */ #define STACK_ALLOC(p, t, n) __try {(p) = _alloca((n)*sizeof(t));} \ __except(EXCEPTION_EXECUTE_HANDLER) {(p) = NULL;} +#endif /* =============================== */ /* osl_gettempDirURL */ @@ -319,8 +321,12 @@ if (osl_File_E_None != osl_error) return osl_error; +#ifdef __MINGW32__ + tmp_name = malloc((rtl_uString_getLength(base_directory) + MAX_PATH)*sizeof(WCHAR)); +#else /* allocate enough space on the stack */ STACK_ALLOC(tmp_name, WCHAR, (rtl_uString_getLength(base_directory) + MAX_PATH)); +#endif if (tmp_name) { @@ -330,6 +336,9 @@ b_delete_on_close, pHandle, ppustrTempFileURL); +#ifdef __MINGW32__ + free(tmp_name); +#endif } else // stack alloc failed { --- ./sal/osl/w32/interlck.c.orig 2000-09-29 23:25:54.000000000 +0900 +++ ./sal/osl/w32/interlck.c 2003-12-13 16:13:10.000000000 +0900 @@ -80,6 +80,16 @@ #ifdef _M_IX86 #pragma warning(disable: 4035) { +#ifdef __MINGW32__ + asm + ( + " movl %0, %%ecx\n" + " movl $1, %%eax\n" + " lock xadd %%eax, (%%ecx)\n" + " incl %%eax\n" + ::"m"(pCount) + ); +#else __asm { mov ecx, pCount @@ -87,6 +97,7 @@ lock xadd dword ptr [ecx],eax inc eax } +#endif } #pragma warning(default: 4035) #else @@ -103,6 +114,16 @@ #ifdef _M_IX86 #pragma warning(disable: 4035) { +#ifdef __MINGW32__ + asm + ( + " movl %0, %%ecx\n" + " movl $-1, %%eax\n" + " lock xadd %%eax, (%%ecx)\n" + " decl %%eax\n" + ::"m"(pCount) + ); +#else __asm { mov ecx, pCount @@ -110,6 +131,7 @@ lock xadd dword ptr [ecx],eax dec eax } +#endif } #pragma warning(default: 4035) #else --- ./sal/osl/w32/signal.c.orig 2003-04-17 23:26:12.000000000 +0900 +++ ./sal/osl/w32/signal.c 2003-11-18 23:11:52.000000000 +0900 @@ -66,7 +66,9 @@ #include #include #include +#ifndef __MINGW32__ #include +#endif #include #include --- ./sal/osl/w32/fileimpl.cxx.orig 2003-05-13 21:28:36.000000000 +0900 +++ ./sal/osl/w32/fileimpl.cxx 2003-12-27 00:53:22.000000000 +0900 @@ -137,11 +137,19 @@ //################################################################## // simply checking if this path starts with '\\' +#ifdef __MINGW32__ + const wchar_t* UNC_PREFIX = L"\\\\"; + + bool is_UNC_path(const rtl::OUString& path) + { + return (0 == wcsncmp(UNC_PREFIX, reinterpret_cast< const wchar_t * >(path.getStr()), wcslen(UNC_PREFIX))); +#else const sal_Unicode* UNC_PREFIX = L"\\\\"; bool is_UNC_path(const rtl::OUString& path) - { + { return (0 == wcsncmp(UNC_PREFIX, path.getStr(), wcslen(UNC_PREFIX))); +#endif } //################################################################## @@ -189,13 +197,20 @@ if (!is_floppy_drive(p)) { +#ifdef __MINGW32__ + DWORD fattr = GetFileAttributes(reinterpret_cast< const wchar_t * >(p.getStr())); +#else DWORD fattr = GetFileAttributes(p.getStr()); - +#endif if ((INVALID_FILE_ATTRIBUTES != fattr) && (FILE_ATTRIBUTE_REPARSE_POINT & fattr)) { WIN32_FIND_DATA find_data; +#ifdef __MINGW32__ + HANDLE h_find = FindFirstFile(reinterpret_cast< const wchar_t * >(p.getStr()), &find_data); +#else HANDLE h_find = FindFirstFile(p.getStr(), &find_data); +#endif if (IsValidHandle(h_find) && (FILE_ATTRIBUTE_REPARSE_POINT & find_data.dwFileAttributes) && @@ -285,7 +300,11 @@ osl_systemPathEnsureSeparator(&p.pData); TCHAR vn[51]; +#ifdef __MINGW32__ + if (GetVolumeNameForVolumeMountPoint(reinterpret_cast< const wchar_t * >(p.getStr()), vn, ELEMENTS_OF_ARRAY(vn))) +#else if (GetVolumeNameForVolumeMountPoint(p.getStr(), vn, ELEMENTS_OF_ARRAY(vn))) +#endif { TCHAR vnfloppy[51]; if (is_floppy_A_present() && @@ -307,12 +326,21 @@ // for the drive letter alone is not sufficient // we must compare the unique volume name with // that of the available floppy disks +#ifdef __MINGW32__ + const wchar_t* FLOPPY_DRV_LETTERS = TEXT("AaBb"); + + bool is_floppy_drive(const rtl::OUString& path) + { + const wchar_t* pf = reinterpret_cast< const wchar_t * >(path.getStr()); + const wchar_t* ps = pf + 1; +#else const sal_Unicode* FLOPPY_DRV_LETTERS = TEXT("AaBb"); bool is_floppy_drive(const rtl::OUString& path) { const sal_Unicode* pf = path.getStr(); const sal_Unicode* ps = path.getStr() + 1; +#endif return ((wcschr(FLOPPY_DRV_LETTERS, *pf) && (L':' == *ps)) || is_floppy_volume_mount_point(path)); } @@ -327,7 +355,11 @@ osl_systemPathEnsureSeparator(&p.pData); TCHAR vn[51]; +#ifdef __MINGW32__ + if (GetVolumeNameForVolumeMountPoint(reinterpret_cast< const wchar_t * >(p.getStr()), vn, ELEMENTS_OF_ARRAY(vn))) +#else if (GetVolumeNameForVolumeMountPoint(p.getStr(), vn, ELEMENTS_OF_ARRAY(vn))) +#endif return GetDriveType(vn); return DRIVE_NO_ROOT_DIR; @@ -342,7 +374,11 @@ if (is_volume_mount_point(path)) drive_type = get_volume_mount_point_drive_type(path); else +#ifdef __MINGW32__ + drive_type = GetDriveType(reinterpret_cast< const wchar_t * >(path.getStr())); +#else drive_type = GetDriveType(path.getStr()); +#endif if (DRIVE_NO_ROOT_DIR == drive_type) return MapError(ERROR_INVALID_DRIVE); @@ -392,7 +428,11 @@ void get_volume_space_information(const rtl::OUString& path, oslVolumeInfo *pInfo) { BOOL ret = GetDiskFreeSpaceEx( +#ifdef __MINGW32__ + reinterpret_cast< const wchar_t * >(path.getStr()), +#else path.getStr(), +#endif (PULARGE_INTEGER)&pInfo->uFreeSpace, (PULARGE_INTEGER)&pInfo->uTotalSpace, NULL); @@ -443,7 +483,11 @@ DWORD mcl; DWORD flags; +#ifdef __MINGW32__ + if (GetVolumeInformation(reinterpret_cast(path.getStr()), vn, MAX_PATH, &serial, &mcl, &flags, fsn, MAX_PATH)) +#else if (GetVolumeInformation(path.getStr(), vn, MAX_PATH, &serial, &mcl, &flags, fsn, MAX_PATH)) +#endif { pInfo->uValidFields |= osl_VolumeInfo_Mask_MaxNameLength; pInfo->uMaxNameLength = mcl; @@ -452,7 +496,11 @@ pInfo->uMaxPathLength = MAX_PATH; pInfo->uValidFields |= osl_VolumeInfo_Mask_FileSystemName; +#ifdef __MINGW32__ + rtl_uString_newFromStr(&pInfo->ustrFileSystemName, reinterpret_cast(fsn)); +#else rtl_uString_newFromStr(&pInfo->ustrFileSystemName, fsn); +#endif // volumes (even NTFS) will always be considered case // insensitive because the Win32 API is not able to --- ./sal/osl/w32/socket.cxx.orig 2003-04-16 02:45:26.000000000 +0900 +++ ./sal/osl/w32/socket.cxx 2003-12-27 00:41:46.000000000 +0900 @@ -1037,7 +1037,11 @@ /*****************************************************************************/ oslSocketResult SAL_CALL osl_getLocalHostname (rtl_uString **strLocalHostname) { +#ifdef __MINGW32__ + static wchar_t LocalHostname[256] = L""; +#else static sal_Unicode LocalHostname[256] = L""; +#endif if (wcslen(LocalHostname) == 0) { @@ -1059,7 +1063,11 @@ rtl_uString_release (hostName); if (pAddr && pAddr->pHostName) +#ifdef __MINGW32__ + wcscpy(LocalHostname, reinterpret_cast< wchar_t * >(pAddr->pHostName->buffer)); +#else wcscpy(LocalHostname, pAddr->pHostName->buffer); +#endif else memset(LocalHostname, 0, sizeof(LocalHostname)); @@ -1070,7 +1078,11 @@ if (wcslen(LocalHostname) > 0) { +#ifdef __MINGW32__ + rtl_uString_newFromStr (strLocalHostname, reinterpret_cast< sal_Unicode * >(LocalHostname)); +#else rtl_uString_newFromStr (strLocalHostname, LocalHostname); +#endif return osl_Socket_Ok; } @@ -1927,211 +1939,416 @@ switch(error = WSAGetLastError()) { case WSAENOTSOCK: +#ifdef __MINGW32__ + rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAENOTSOCK, Socket operation on non-socket. A socket created in one process is used by another process.")); +#else rtl_uString_newFromStr (strError, L"WSAENOTSOCK, Socket operation on non-socket. A socket created in one process is used by another process."); +#endif break; case WSAEDESTADDRREQ: +#ifdef __MINGW32__ + rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAEDESTADDRREQ, Destination Addr required")); +#else rtl_uString_newFromStr (strError, L"WSAEDESTADDRREQ, Destination Addr required"); +#endif break; case WSAEMSGSIZE: +#ifdef __MINGW32__ + rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAEMSGSIZE, Message too long")); +#else rtl_uString_newFromStr (strError, L"WSAEMSGSIZE, Message too long"); +#endif break; case WSAEPROTOTYPE: +#ifdef __MINGW32__ + rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAEPROTOTYPE, Protocol wrong type for socket")); +#else rtl_uString_newFromStr (strError, L"WSAEPROTOTYPE, Protocol wrong type for socket"); +#endif break; case WSAENOPROTOOPT: +#ifdef __MINGW32__ + rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAENOPROTOOPT, Protocol not available")); +#else rtl_uString_newFromStr (strError, L"WSAENOPROTOOPT, Protocol not available"); +#endif break; case WSAEPROTONOSUPPORT: +#ifdef __MINGW32__ + rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAEPROTONOSUPPORT, Protocol not supported")); +#else rtl_uString_newFromStr (strError, L"WSAEPROTONOSUPPORT, Protocol not supported"); +#endif break; case WSAESOCKTNOSUPPORT: +#ifdef __MINGW32__ + rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAESOCKTNOSUPPORT, Socket type not supported")); +#else rtl_uString_newFromStr (strError, L"WSAESOCKTNOSUPPORT, Socket type not supported"); +#endif break; case WSAEOPNOTSUPP: +#ifdef __MINGW32__ + rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAEOPNOTSUPP, Operation not supported on socket")); +#else rtl_uString_newFromStr (strError, L"WSAEOPNOTSUPP, Operation not supported on socket"); +#endif break; case WSAEPFNOSUPPORT: +#ifdef __MINGW32__ + rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAEPFNOSUPPORT, Protocol family not supported")); +#else rtl_uString_newFromStr (strError, L"WSAEPFNOSUPPORT, Protocol family not supported"); +#endif break; case WSAEAFNOSUPPORT: +#ifdef __MINGW32__ + rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSEAFNOSUPPORT, Addr family not supported by protocol family")); +#else rtl_uString_newFromStr (strError, L"WSEAFNOSUPPORT, Addr family not supported by protocol family"); +#endif break; case WSAEADDRINUSE: +#ifdef __MINGW32__ + rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAEADDRINUSE, Triggered by bind() because a process went down without closing a socket.")); +#else rtl_uString_newFromStr (strError, L"WSAEADDRINUSE, Triggered by bind() because a process went down without closing a socket."); +#endif break; case WSAEADDRNOTAVAIL: +#ifdef __MINGW32__ + rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAEADDRNOTAVAIL, Can't assign requested Addr")); +#else rtl_uString_newFromStr (strError, L"WSAEADDRNOTAVAIL, Can't assign requested Addr"); +#endif break; case WSAENETDOWN: +#ifdef __MINGW32__ + rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAENETDOWN, Network is down")); +#else rtl_uString_newFromStr (strError, L"WSAENETDOWN, Network is down"); +#endif break; case WSAENETUNREACH: +#ifdef __MINGW32__ + rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAENETUNREACH, Network is unreachable")); +#else rtl_uString_newFromStr (strError, L"WSAENETUNREACH, Network is unreachable"); +#endif break; case WSAENETRESET: +#ifdef __MINGW32__ + rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAENETRESET, Network dropped connection or reset")); +#else rtl_uString_newFromStr (strError, L"WSAENETRESET, Network dropped connection or reset"); +#endif break; case WSAECONNABORTED: +#ifdef __MINGW32__ + rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAECONNABORTED, Software caused connection abort")); +#else rtl_uString_newFromStr (strError, L"WSAECONNABORTED, Software caused connection abort"); +#endif break; case WSAECONNRESET: +#ifdef __MINGW32__ + rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAECONNRESET, Connection reset by peer")); +#else rtl_uString_newFromStr (strError, L"WSAECONNRESET, Connection reset by peer"); +#endif break; case WSAENOBUFS: +#ifdef __MINGW32__ + rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAENOBUFS, No buffer space available.")); +#else rtl_uString_newFromStr (strError, L"WSAENOBUFS, No buffer space available."); +#endif break; case WSAEISCONN: +#ifdef __MINGW32__ + rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAEISCONN, Socket is already connected")); +#else rtl_uString_newFromStr (strError, L"WSAEISCONN, Socket is already connected"); +#endif break; case WSAENOTCONN: +#ifdef __MINGW32__ + rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAENOTCONN, Socket is not connected")); +#else rtl_uString_newFromStr (strError, L"WSAENOTCONN, Socket is not connected"); +#endif break; case WSAESHUTDOWN: +#ifdef __MINGW32__ + rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAESHUTDOWN, Can't send after socket shutdown")); +#else rtl_uString_newFromStr (strError, L"WSAESHUTDOWN, Can't send after socket shutdown"); +#endif break; case WSAETIMEDOUT: +#ifdef __MINGW32__ + rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAETIMEDOUT, Connection timed out")); +#else rtl_uString_newFromStr (strError, L"WSAETIMEDOUT, Connection timed out"); +#endif break; case WSAECONNREFUSED: +#ifdef __MINGW32__ + rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAECONNREFUSED, Connection refused")); +#else rtl_uString_newFromStr (strError, L"WSAECONNREFUSED, Connection refused"); +#endif break; case WSAEHOSTDOWN: +#ifdef __MINGW32__ + rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAEHOSTDOWN, Networking subsystem not started")); +#else rtl_uString_newFromStr (strError, L"WSAEHOSTDOWN, Networking subsystem not started"); +#endif break; case WSAEHOSTUNREACH: +#ifdef __MINGW32__ + rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAEHOSTUNREACH, No route to host")); +#else rtl_uString_newFromStr (strError, L"WSAEHOSTUNREACH, No route to host"); +#endif break; case WSAEWOULDBLOCK: +#ifdef __MINGW32__ + rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAEWOULDBLOCK, Operation would block")); +#else rtl_uString_newFromStr (strError, L"WSAEWOULDBLOCK, Operation would block"); +#endif break; case WSAEINPROGRESS: +#ifdef __MINGW32__ + rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAEINPROGRESS, Operation now in progress")); +#else rtl_uString_newFromStr (strError, L"WSAEINPROGRESS, Operation now in progress"); +#endif break; case WSAEALREADY: +#ifdef __MINGW32__ + rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAEALREADY, Operation already in progress")); +#else rtl_uString_newFromStr (strError, L"WSAEALREADY, Operation already in progress"); +#endif break; case WSAEINTR: +#ifdef __MINGW32__ + rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAEALREADY, Operation was interrupted")); +#else rtl_uString_newFromStr (strError, L"WSAEALREADY, Operation was interrupted"); +#endif break; case WSAEBADF: +#ifdef __MINGW32__ + rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAEBADF, Bad file number")); +#else rtl_uString_newFromStr (strError, L"WSAEBADF, Bad file number"); +#endif break; case WSAEACCES: +#ifdef __MINGW32__ + rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAEACCES, Access is denied")); +#else rtl_uString_newFromStr (strError, L"WSAEACCES, Access is denied"); +#endif break; case WSAEFAULT: +#ifdef __MINGW32__ + rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAEFAULT, Bad memory Addr")); +#else rtl_uString_newFromStr (strError, L"WSAEFAULT, Bad memory Addr"); +#endif break; case WSAEINVAL: +#ifdef __MINGW32__ + rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAEINVAL, The socket has not been bound with bind() or is already connected")); +#else rtl_uString_newFromStr (strError, L"WSAEINVAL, The socket has not been bound with bind() or is already connected"); +#endif break; case WSAEMFILE: +#ifdef __MINGW32__ + rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAEMFILE, No more file descriptors are available")); +#else rtl_uString_newFromStr (strError, L"WSAEMFILE, No more file descriptors are available"); +#endif break; case WSAETOOMANYREFS: +#ifdef __MINGW32__ + rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAETOOMANYREFS, Undocumented WinSock error")); +#else rtl_uString_newFromStr (strError, L"WSAETOOMANYREFS, Undocumented WinSock error"); +#endif break; case WSAENAMETOOLONG: +#ifdef __MINGW32__ + rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAENAMETOOLONG, Undocumented WinSock error")); +#else rtl_uString_newFromStr (strError, L"WSAENAMETOOLONG, Undocumented WinSock error"); +#endif break; case WSAENOTEMPTY: +#ifdef __MINGW32__ + rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAENOTEMPTY, Undocumented WinSock error")); +#else rtl_uString_newFromStr (strError, L"WSAENOTEMPTY, Undocumented WinSock error"); +#endif break; case WSAEPROCLIM: +#ifdef __MINGW32__ + rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAEPROCLIM, Undocumented WinSock error")); +#else rtl_uString_newFromStr (strError, L"WSAEPROCLIM, Undocumented WinSock error"); +#endif break; case WSAEUSERS: +#ifdef __MINGW32__ + rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAEUSERS, Undocumented WinSock error")); +#else rtl_uString_newFromStr (strError, L"WSAEUSERS, Undocumented WinSock error"); +#endif break; case WSAEDQUOT: +#ifdef __MINGW32__ + rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAEDQUOT, Undocumented WinSock error")); +#else rtl_uString_newFromStr (strError, L"WSAEDQUOT, Undocumented WinSock error"); +#endif break; case WSAESTALE: +#ifdef __MINGW32__ + rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAESTALE, Undocumented WinSock error")); +#else rtl_uString_newFromStr (strError, L"WSAESTALE, Undocumented WinSock error"); +#endif break; case WSAEREMOTE: +#ifdef __MINGW32__ + rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAEREMOTE, Undocumented WinSock error")); +#else rtl_uString_newFromStr (strError, L"WSAEREMOTE, Undocumented WinSock error"); +#endif break; case WSAEDISCON: +#ifdef __MINGW32__ + rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAEDISCON, Circuit was gracefully terminated")); +#else rtl_uString_newFromStr (strError, L"WSAEDISCON, Circuit was gracefully terminated"); +#endif break; case WSASYSNOTREADY: +#ifdef __MINGW32__ + rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSASYSNOTREADY, The underlying network subsystem is not ready for network communication")); +#else rtl_uString_newFromStr (strError, L"WSASYSNOTREADY, The underlying network subsystem is not ready for network communication"); +#endif break; case WSAVERNOTSUPPORTED: +#ifdef __MINGW32__ + rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAVERNOTSUPPORTED, The version of Windows Sockets API support requested is not provided by this particular Windows Sockets implementation")); +#else rtl_uString_newFromStr (strError, L"WSAVERNOTSUPPORTED, The version of Windows Sockets API support requested is not provided by this particular Windows Sockets implementation"); +#endif break; case WSANOTINITIALISED: +#ifdef __MINGW32__ + rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSANOTINITIALISED, WSAStartup() has not been called")); +#else rtl_uString_newFromStr (strError, L"WSANOTINITIALISED, WSAStartup() has not been called"); +#endif break; case WSAHOST_NOT_FOUND: +#ifdef __MINGW32__ + rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSAHOST_NOT_FOUND, Authoritative answer host not found")); +#else rtl_uString_newFromStr (strError, L"WSAHOST_NOT_FOUND, Authoritative answer host not found"); +#endif break; case WSATRY_AGAIN: +#ifdef __MINGW32__ + rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSATRY_AGAIN, Non-authoritative answer host not found or SERVERFAIL")); +#else rtl_uString_newFromStr (strError, L"WSATRY_AGAIN, Non-authoritative answer host not found or SERVERFAIL"); +#endif break; case WSANO_RECOVERY: +#ifdef __MINGW32__ + rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSANO_RECOVERY, Non recoverable errors, FORMERR, REFUSED, NOTIMP")); +#else rtl_uString_newFromStr (strError, L"WSANO_RECOVERY, Non recoverable errors, FORMERR, REFUSED, NOTIMP"); +#endif break; case WSANO_DATA: +#ifdef __MINGW32__ + rtl_uString_newFromStr (strError, reinterpret_cast< const sal_Unicode * >(L"WSANO_DATA or WSANO_ADDRESS, Valid name, no data record of requested type")); +#else rtl_uString_newFromStr (strError, L"WSANO_DATA or WSANO_ADDRESS, Valid name, no data record of requested type"); +#endif break; default: { sal_Unicode message[128]; +#ifdef __MINGW32__ + wsprintfW((wchar_t *)message, L"Unknown WinSock Error Number %d", error); + rtl_uString_newFromStr (strError, message); +#else wsprintfW((sal_Unicode *)message, (sal_Unicode *)L"Unknown WinSock Error Number %d", error); rtl_uString_newFromStr (strError, message); +#endif } return; --- ./sal/inc/systools/win32/uwinapi.h.orig 2003-03-27 01:46:00.000000000 +0900 +++ ./sal/inc/systools/win32/uwinapi.h 2003-11-30 01:03:24.000000000 +0900 @@ -71,6 +71,13 @@ # include #endif +#ifdef __MINGW32__ +#include +#ifdef _UWINAPI_ +#define WINBASEAPI +#endif +#endif + /** GetUserDomain The GetUserDomain function retrieves the name of the NT domain the user is --- ./sal/inc/sal/types.h.orig 2003-03-27 01:45:58.000000000 +0900 +++ ./sal/inc/sal/types.h 2003-12-25 23:15:52.000000000 +0900 @@ -95,7 +95,7 @@ typedef char sal_Char; typedef signed char sal_sChar; typedef unsigned char sal_uChar; -#if defined(SAL_W32) +#if defined(SAL_W32) && !defined(__MINGW32__) typedef wchar_t sal_Unicode; #else #define SAL_UNICODE_NOTEQUAL_WCHAR_T @@ -111,10 +111,15 @@ #define SAL_MAX_ENUM 0x7fff #endif -#ifdef _MSC_VER +#if defined(_MSC_VER) || defined(__MINGW32__) # define SAL_DLLEXPORT __declspec(dllexport) +#if defined(_MSC_VER) # define SAL_CALL __cdecl # define SAL_CALL_ELLIPSE __cdecl +#else +# define SAL_CALL +# define SAL_CALL_ELLIPSE +#endif #elif defined SAL_OS2 # define SAL_DLLEXPORT # define SAL_CALL @@ -135,7 +140,7 @@ This hinders the compiler from setting a generic vtable stating that a pure virtual function was called and thus slightly reduces code size. */ -#ifdef _MSC_VER +#if defined(_MSC_VER) || !defined(__MINGW32__) #define SAL_NO_VTABLE __declspec(novtable) #else #define SAL_NO_VTABLE --- ./sal/inc/sal/config.h.orig 2003-06-12 18:46:08.000000000 +0900 +++ ./sal/inc/sal/config.h 2004-01-12 10:40:52.000000000 +0900 @@ -99,12 +99,16 @@ #endif #endif /* defined _MSC_VER < 1300 */ +#endif /* defined _MSC_VER */ + /* Provide ISO C99 compatible versions of snprint and vsnprintf */ +#ifdef __MINGW32__ +#define _SNPRINTF_DLLIMPORT +#endif #ifndef _SNPRINTF_H #include #endif -#endif /* defined _MSC_VER */ #endif /* defined WIN32 */ /* BR: 16bit fuer Borland-Compiler */ --- ./sj2/prj/d.lst.orig 2003-05-28 00:45:02.000000000 +0900 +++ ./sj2/prj/d.lst 2004-01-13 23:17:30.000000000 +0900 @@ -5,6 +5,7 @@ ..\%__SRC%\lib\sj.lib %_DEST%\lib%_EXT%\sj.lib ..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT% +..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT% ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib ..\%__SRC%\slb\sj.lib %_DEST%\lib%_EXT%\xsj.lib ..\%__SRC%\bin\j?????_g.dll %_DEST%\bin%_EXT%\j?????_g.dll --- ./so3/source/ole/helpers.cxx.orig 2003-03-27 20:28:18.000000000 +0900 +++ ./so3/source/ole/helpers.cxx 2004-01-18 10:22:40.000000000 +0900 @@ -68,6 +68,8 @@ #define ARRAYSIZE(a) (sizeof(a)/sizeof(a[0])) +static BOOL GetFileTimes(LPTSTR pszFileName, FILETIME *pft); + /* * StarObject_MetafilePictIconFree * --- ./so3/source/ole/soole.h.orig 2000-09-19 01:54:26.000000000 +0900 +++ ./so3/source/ole/soole.h 2004-01-18 10:33:58.000000000 +0900 @@ -159,6 +159,9 @@ #endif //OLECHAR #endif //_WIN32 +#endif //_OLE2_H_ + +#if defined(_OLE2_H_) || defined(__MINGW32__) //May not include ole2.h at all times. //Useful macros. #define SETFormatEtc(fe, cf, asp, td, med, li) \ @@ -501,6 +504,160 @@ #endif -BOOL GetFileTimes(LPTSTR, FILETIME *); +// BOOL GetFileTimes(LPTSTR, FILETIME *); + +#ifdef __MINGW32__ + +typedef +enum tagOLEMISC + { OLEMISC_RECOMPOSEONRESIZE = 0x1, + OLEMISC_ONLYICONIC = 0x2, + OLEMISC_INSERTNOTREPLACE = 0x4, + OLEMISC_STATIC = 0x8, + OLEMISC_CANTLINKINSIDE = 0x10, + OLEMISC_CANLINKBYOLE1 = 0x20, + OLEMISC_ISLINKOBJECT = 0x40, + OLEMISC_INSIDEOUT = 0x80, + OLEMISC_ACTIVATEWHENVISIBLE = 0x100, + OLEMISC_RENDERINGISDEVICEINDEPENDENT = 0x200, + OLEMISC_INVISIBLEATRUNTIME = 0x400, + OLEMISC_ALWAYSRUN = 0x800, + OLEMISC_ACTSLIKEBUTTON = 0x1000, + OLEMISC_ACTSLIKELABEL = 0x2000, + OLEMISC_NOUIACTIVATE = 0x4000, + OLEMISC_ALIGNABLE = 0x8000, + OLEMISC_SIMPLEFRAME = 0x10000, + OLEMISC_SETCLIENTSITEFIRST = 0x20000, + OLEMISC_IMEMODE = 0x40000, + OLEMISC_IGNOREACTIVATEWHENVISIBLE = 0x80000, + OLEMISC_WANTSTOMENUMERGE = 0x100000, + OLEMISC_SUPPORTSMULTILEVELUNDO = 0x200000 + } OLEMISC; + +typedef interface IOleCache IOleCache; +typedef interface IOleLink IOleLink; + +typedef /* [unique] */ IOleCache *LPOLECACHE; + + +EXTERN_C const IID IID_IOleCache; + + MIDL_INTERFACE("0000011e-0000-0000-C000-000000000046") + IOleCache : public IUnknown + { + public: + virtual HRESULT STDMETHODCALLTYPE Cache( + /* [unique][in] */ FORMATETC *pformatetc, + /* [in] */ DWORD advf, + /* [out] */ DWORD *pdwConnection) = 0; + + virtual HRESULT STDMETHODCALLTYPE Uncache( + /* [in] */ DWORD dwConnection) = 0; + + virtual HRESULT STDMETHODCALLTYPE EnumCache( + /* [out] */ IEnumSTATDATA **ppenumSTATDATA) = 0; + + virtual HRESULT STDMETHODCALLTYPE InitCache( + /* [unique][in] */ IDataObject *pDataObject) = 0; + + virtual HRESULT STDMETHODCALLTYPE SetData( + /* [unique][in] */ FORMATETC *pformatetc, + /* [unique][in] */ STGMEDIUM *pmedium, + /* [in] */ BOOL fRelease) = 0; + + }; + +typedef /* [unique] */ IOleLink *LPOLELINK; + +typedef +enum tagOLEUPDATE + { OLEUPDATE_ALWAYS = 1, + OLEUPDATE_ONCALL = 3 + } OLEUPDATE; + +typedef OLEUPDATE *LPOLEUPDATE; + +typedef OLEUPDATE *POLEUPDATE; + +typedef +enum tagOLELINKBIND + { OLELINKBIND_EVENIFCLASSDIFF = 1 + } OLELINKBIND; + + +EXTERN_C const IID IID_IOleLink; + + MIDL_INTERFACE("0000011d-0000-0000-C000-000000000046") + IOleLink : public IUnknown + { + public: + virtual HRESULT STDMETHODCALLTYPE SetUpdateOptions( + /* [in] */ DWORD dwUpdateOpt) = 0; + + virtual HRESULT STDMETHODCALLTYPE GetUpdateOptions( + /* [out] */ DWORD *pdwUpdateOpt) = 0; + + virtual HRESULT STDMETHODCALLTYPE SetSourceMoniker( + /* [unique][in] */ IMoniker *pmk, + /* [in] */ REFCLSID rclsid) = 0; + + virtual HRESULT STDMETHODCALLTYPE GetSourceMoniker( + /* [out] */ IMoniker **ppmk) = 0; + + virtual HRESULT STDMETHODCALLTYPE SetSourceDisplayName( + /* [in] */ LPCOLESTR pszStatusText) = 0; + + virtual HRESULT STDMETHODCALLTYPE GetSourceDisplayName( + /* [out] */ LPOLESTR *ppszDisplayName) = 0; + + virtual HRESULT STDMETHODCALLTYPE BindToSource( + /* [in] */ DWORD bindflags, + /* [unique][in] */ IBindCtx *pbc) = 0; + + virtual HRESULT STDMETHODCALLTYPE BindIfRunning( void) = 0; + + virtual HRESULT STDMETHODCALLTYPE GetBoundSource( + /* [out] */ IUnknown **ppunk) = 0; + + virtual HRESULT STDMETHODCALLTYPE UnbindSource( void) = 0; + + virtual HRESULT STDMETHODCALLTYPE Update( + /* [unique][in] */ IBindCtx *pbc) = 0; + + }; + +typedef +enum tagOLERENDER + { OLERENDER_NONE = 0, + OLERENDER_DRAW = 1, + OLERENDER_FORMAT = 2, + OLERENDER_ASIS = 3 + } OLERENDER; + +typedef OLERENDER *LPOLERENDER; + +typedef struct tagOBJECTDESCRIPTOR + { + ULONG cbSize; + CLSID clsid; + DWORD dwDrawAspect; + SIZEL sizel; + POINTL pointl; + DWORD dwStatus; + DWORD dwFullUserTypeName; + DWORD dwSrcOfCopy; + } OBJECTDESCRIPTOR; + +typedef struct tagOBJECTDESCRIPTOR *POBJECTDESCRIPTOR; + +typedef struct tagOBJECTDESCRIPTOR *LPOBJECTDESCRIPTOR; + +typedef struct tagOBJECTDESCRIPTOR LINKSRCDESCRIPTOR; + +typedef struct tagOBJECTDESCRIPTOR *PLINKSRCDESCRIPTOR; + +typedef struct tagOBJECTDESCRIPTOR *LPLINKSRCDESCRIPTOR; + +#endif #endif //_StarObject_H_ --- ./so3/source/misc/factory.cxx.orig 2003-04-24 22:59:42.000000000 +0900 +++ ./so3/source/misc/factory.cxx 2004-01-18 11:12:02.000000000 +0900 @@ -841,7 +841,7 @@ #ifdef WNT if( !Find( GetAutoConvertTo( pStor->GetClassName() ) ) ) { - return SvOutPlaceObject::CreateFromData( xTrans, pStor ); + return SvObjectRef(SvOutPlaceObject::CreateFromData( xTrans, pStor )); } #endif return SvObjectRef(); --- ./so3/source/inplace/outplace.cxx.orig 2003-07-22 20:07:06.000000000 +0900 +++ ./so3/source/inplace/outplace.cxx 2004-01-18 11:07:16.000000000 +0900 @@ -103,6 +103,13 @@ #include #endif #include +#ifdef __MINGW32__ +typedef /* [v1_enum] */ +enum tagOLEVERBATTRIB + { OLEVERBATTRIB_NEVERDIRTIES = 1, + OLEVERBATTRIB_ONCONTAINERMENU = 2 + } OLEVERBATTRIB; +#endif using namespace vos; using namespace ::com::sun::star::uno; @@ -465,7 +472,7 @@ const SvVerbList & SvOutPlaceObject::GetVerbList() const /* [Beschreibung] - Liefert eine Liste der Aktionen zurück, die auf diesem Objekt ausgeführt werden können. + Liefert eine Liste der Aktionen zurk, die auf diesem Objekt ausgefrt werden k nen. */ { #ifdef WNT @@ -689,7 +696,7 @@ OModule aOleDlgLib; if( !aOleDlgLib.load( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "oledlg" ) ) ) ) - return xRet; + return SvInPlaceObjectRef(xRet); #ifdef UNICODE OleUIInsertObjectW_Type * pInsertFct = (OleUIInsertObjectW_Type *) @@ -699,7 +706,7 @@ aOleDlgLib.getSymbol( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "OleUIInsertObjectA" ) ) ); #endif if( !pInsertFct ) - return xRet; + return SvInPlaceObjectRef(xRet); //uTemp=pInsertFct(&io); //uTemp=OleUIInsertObject(&io); @@ -841,7 +848,7 @@ OModule aOleDlgLib; if( !aOleDlgLib.load( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "oledlg" ) ) ) ) - return xRet; + return SvInPlaceObjectRef(xRet); #ifdef UNICODE OleUIInsertObjectW_Type * pInsertFct = (OleUIInsertObjectW_Type *) @@ -851,7 +858,7 @@ aOleDlgLib.getSymbol( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "OleUIInsertObjectA" ) ) ); #endif if( !pInsertFct ) - return xRet; + return SvInPlaceObjectRef(xRet); uTemp=pInsertFct(&io); //uTemp=OleUIInsertObject(&io); @@ -876,7 +883,7 @@ bIsInternal = TRUE; rTypeName = pInternalServer->GetHumanName(); rInternalClassName = pInternalServer->GetClassName(); - return xRet; + return SvInPlaceObjectRef(xRet); } tType=TENANTTYPE_EMBEDDEDOBJECT; @@ -905,7 +912,7 @@ // so it will be inserted without actuall OLE embedding bIsInternal = TRUE; - return xRet; + return SvInPlaceObjectRef(xRet); } } @@ -978,7 +985,7 @@ else { pDO->Release(); - return xRet; + return SvInPlaceObjectRef(xRet); } @@ -1050,7 +1057,7 @@ else { pDO->Release(); - return xRet; + return SvInPlaceObjectRef(xRet); } xRet = new SvOutPlaceObject(); xRet->DoInitNew( pIStorage ); --- ./so3/prj/d.lst.orig 2003-05-28 00:47:10.000000000 +0900 +++ ./so3/prj/d.lst 2004-01-13 23:18:08.000000000 +0900 @@ -1,6 +1,7 @@ touch: ..\%__SRC%\misc\so3.hid %_DEST%\bin%_EXT%\so3.hid ..\%__SRC%\lib\so2.lib %_DEST%\lib%_EXT%\so2.lib ..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT% +..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT% ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib ..\%__SRC%\srs\src.srs %_DEST%\res%_EXT%\so2.srs ..\%__SRC%\bin\*.tlb %_DEST%\bin%_EXT%\*.tlb --- ./forms/prj/d.lst.orig 2003-05-28 00:55:40.000000000 +0900 +++ ./forms/prj/d.lst 2004-01-13 22:59:30.000000000 +0900 @@ -1,5 +1,6 @@ ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll ..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT% +..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT% ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib ..\%__SRC%\lib\*.sl %_DEST%\lib%_EXT%\*.sl ..\%__SRC%\bin\*.bin %_DEST%\bin%_EXT%\*.bin --- ./UnoControls/prj/d.lst.orig 2003-05-28 00:44:10.000000000 +0900 +++ ./UnoControls/prj/d.lst 2004-01-13 21:56:20.000000000 +0900 @@ -1,5 +1,6 @@ ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll ..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT% +..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT% ..\%__SRC%\lib\*.sl %_DEST%\lib%_EXT%\*.sl ..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*.res ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib --- ./rsc/source/tools/rsctools.cxx.orig 2002-08-16 01:18:44.000000000 +0900 +++ ./rsc/source/tools/rsctools.cxx 2003-12-30 01:08:24.000000000 +0900 @@ -165,6 +165,8 @@ return ByteString( tmpnam( NULL ) ); #elif MACOSX return ByteString( macxp_tempnam( NULL, NULL ) ); +#elif defined(__MINGW32__) + return ByteString( tempnam( (const char *) _P_tmpdir, NULL ) ); #else return ByteString( tempnam( (const char *) P_tmpdir, NULL ) ); #endif --- ./rsc/source/prj/gui.cxx.orig 2003-04-16 00:55:14.000000000 +0900 +++ ./rsc/source/prj/gui.cxx 2003-12-30 01:14:54.000000000 +0900 @@ -80,7 +80,7 @@ /* */ /* Description : Gibt die Temporaeren Dateien frei. */ /****************************************************************/ -#if defined( UNX ) || ( defined( PM2 ) && ( defined( TCPP ) || defined ( GCC )) ) || defined( MAC ) || defined (WTC) || defined (MTW) +#if defined( UNX ) || ( defined( PM2 ) && ( defined( TCPP ) || defined ( GCC )) ) || defined( MAC ) || defined (WTC) || defined (MTW) || defined(__MINGW32__) void ExitProgram( void ){ #else #if defined( CSET ) @@ -105,7 +105,7 @@ } -#if defined( UNX ) || defined( MAC ) || ( defined( PM2 ) && ( defined( CSET ) || defined ( GCC ))) || defined (WTC) || defined(ICC) +#if defined( UNX ) || defined( MAC ) || ( defined( PM2 ) && ( defined( CSET ) || defined ( GCC ))) || defined (WTC) || defined(ICC) || defined(__MINGW32__) int main ( int argc, char ** argv) { #else #if defined( MTW ) --- ./rsc/source/prj/start.cxx.orig 2001-11-05 23:44:06.000000000 +0900 +++ ./rsc/source/prj/start.cxx 2003-12-30 01:16:10.000000000 +0900 @@ -302,7 +302,7 @@ |* Letzte Aenderung MM 05.09.91 |* *************************************************************************/ -#if defined UNX || (defined PM2 && (defined CSET || defined GCC )) || defined WTC || defined MTW || defined ICC +#if defined UNX || (defined PM2 && (defined CSET || defined GCC )) || defined WTC || defined MTW || defined ICC || defined(__MINGW32__) int main ( int argc, char ** argv) { #else --- ./vcl/win/source/window/salframe.cxx.orig 2003-04-25 00:17:30.000000000 +0900 +++ ./vcl/win/source/window/salframe.cxx 2004-01-12 11:09:28.000000000 +0900 @@ -139,6 +139,35 @@ #ifndef _SV_SVAPP_HXX #include #endif +#ifdef __MINGW32__ + +#define SM_XVIRTUALSCREEN 76 +#define SM_YVIRTUALSCREEN 77 +#define SM_CXVIRTUALSCREEN 78 +#define SM_CYVIRTUALSCREEN 79 +#define SM_CMONITORS 80 +#define SM_SAMEDISPLAYFORMAT 81 + +// HMONITOR is already declared if WINVER >= 0x0500 in windef.h +// This is for components built with an older version number. +// +#if !defined(HMONITOR_DECLARED) && (WINVER < 0x0500) +DECLARE_HANDLE(HMONITOR); +#define HMONITOR_DECLARED +#endif + +#ifndef CCHDEVICENAME +#define CCHDEVICENAME 32 +#endif + +#ifndef DISPLAY_DEVICE_ATTACHED_TO_DESKTOP +#define DISPLAY_DEVICE_ATTACHED_TO_DESKTOP 0x00000001 +#define DISPLAY_DEVICE_MULTI_DRIVER 0x00000002 +#define DISPLAY_DEVICE_PRIMARY_DEVICE 0x00000004 +#define DISPLAY_DEVICE_MIRRORING_DRIVER 0x00000008 +#define DISPLAY_DEVICE_VGA_COMPATIBLE 0x00000010 +#endif +#endif #define COMPILE_MULTIMON_STUBS #include @@ -2702,7 +2731,7 @@ StyleSettings aStyleSettings = rSettings.GetStyleSettings(); BOOL bCompBorder = (aStyleSettings.GetOptions() & (STYLE_OPTION_MACSTYLE | STYLE_OPTION_UNIXSTYLE)) == 0; -#if (_MSC_VER < 1300) +#if (_MSC_VER < 1300) && !defined(__MINGW32__) aStyleSettings.SetScrollBarSize( std::min( GetSystemMetrics( SM_CXVSCROLL ), 20 ) ); // #99956# do not allow huge scrollbars, most of the UI is not scaled anymore aStyleSettings.SetSpinSize( std::min( GetSystemMetrics( SM_CXVSCROLL ), 20 ) ); #else --- ./vcl/win/source/gdi/winlayout.cxx.orig 2003-08-20 22:47:52.000000000 +0900 +++ ./vcl/win/source/gdi/winlayout.cxx 2004-01-12 10:10:02.000000000 +0900 @@ -721,7 +721,7 @@ Point aPos = GetDrawPosition( Point( mnBaseAdv, 0 ) ); // #108267#, limit the number of glyphs to avoid paint errors -#if (_MSC_VER < 1300) +#if (_MSC_VER < 1300) && !defined(__MINGW32__) UINT limitedGlyphCount = std::min( 8192, mnGlyphCount ); #else UINT limitedGlyphCount = min( 8192, mnGlyphCount ); --- ./vcl/win/source/gdi/salprn.cxx.orig 2003-07-21 20:22:14.000000000 +0900 +++ ./vcl/win/source/gdi/salprn.cxx 2004-01-12 09:47:14.000000000 +0900 @@ -63,6 +63,9 @@ #ifndef _SVWIN_H #include #endif +#ifdef __MINGW32__ +#define DC_COLLATE 22 +#endif #define _SV_SALPRN_CXX --- ./vcl/win/source/gdi/salgdi3.cxx.orig 2003-06-30 23:32:50.000000000 +0900 +++ ./vcl/win/source/gdi/salgdi3.cxx 2004-01-12 10:02:52.000000000 +0900 @@ -476,7 +476,11 @@ void ImplSalLogFontToFontW( HDC hDC, const LOGFONTW& rLogFont, Font& rFont, BOOL bReplaceFont ) { +#ifdef __MINGW32__ + XubString aFontName( reinterpret_cast< const unsigned short int * >(rLogFont.lfFaceName) ); +#else XubString aFontName( rLogFont.lfFaceName ); +#endif if ( aFontName.Len() ) { if ( bReplaceFont ) @@ -900,7 +904,11 @@ { wchar_t aFaceName[LF_FACESIZE+60]; if ( GetTextFaceW( maGraphicsData.mhDC, sizeof( aFaceName ) / sizeof( wchar_t ), aFaceName ) ) +#ifdef __MINGW32__ + pMetric->maName = reinterpret_cast< const unsigned short int * >(aFaceName); +#else pMetric->maName = aFaceName; +#endif TEXTMETRICW aWinMetric; if ( GetTextMetricsW( maGraphicsData.mhDC, &aWinMetric ) ) @@ -1429,7 +1437,11 @@ pInfo->mbCourier = ImplSalWICompareAscii( pLogFont->elfLogFont.lfFaceName, "Courier" ) == 0; else pInfo->mbCourier = FALSE; +#ifdef __MINGW32__ + XubString aName( reinterpret_cast< const unsigned short int * >(pLogFont->elfLogFont.lfFaceName) ); +#else XubString aName( pLogFont->elfLogFont.lfFaceName ); +#endif pInfo->mpName = &aName; memcpy( pInfo->mpLogFontW->lfFaceName, pLogFont->elfLogFont.lfFaceName, (aName.Len()+1)*sizeof( wchar_t ) ); pInfo->mpLogFontW->lfCharSet = pLogFont->elfLogFont.lfCharSet; @@ -1455,7 +1467,11 @@ ImplLogMetricToDevFontDataW( &(pLogFont->elfLogFont), &(pMetric->ntmTm), nFontType, pData ); // Test if Stylename is correct - const wchar_t* pStyleName = pLogFont->elfStyle; +#ifdef __MINGW32__ + const wchar_t* pStyleName = reinterpret_cast< const wchar_t* >(pLogFont->elfStyle); +#else + const wchar_t* pStyleName = reinterpret_cast< const unsigned short int * >(pLogFont->elfStyle); +#endif const wchar_t* pTemp = pStyleName; const wchar_t* pEnd = pTemp + sizeof( pLogFont->elfStyle )/sizeof( wchar_t ); while ( *pTemp && (pTemp < pEnd) ) @@ -1468,7 +1484,11 @@ pTemp++; } if ( pStyleName && (pTemp < pEnd) ) +#ifdef __MINGW32__ + pData->maStyleName = reinterpret_cast< const unsigned short int * >(pStyleName); +#else pData->maStyleName = pStyleName; +#endif pData->mpSysData = (void*)(pLogFont->elfLogFont.lfCharSet); BOOL bAdd = TRUE; @@ -1615,7 +1635,7 @@ char aResourceName[512]; int nMaxLen = sizeof(aResourceName)/sizeof(*aResourceName) - 16; int nLen = ::GetTempPathA( nMaxLen, aResourceName ); -#if (_MSC_VER < 1300) +#if (_MSC_VER < 1300) && !defined(__MINGW32__) ::strncpy( aResourceName + nLen, aFileName, std::max( 0, nMaxLen - nLen )); #else ::strncpy( aResourceName + nLen, aFileName, max( 0, nMaxLen - nLen )); --- ./vcl/win/source/gdi/salogl.cxx.orig 2001-02-03 00:18:28.000000000 +0900 +++ ./vcl/win/source/gdi/salogl.cxx 2004-01-12 10:07:16.000000000 +0900 @@ -100,9 +100,15 @@ // ---------- #define INIT_OGLFNC_WGL( FncName ) static OGLFnc##FncName pImplOpenWGLFnc##FncName = NULL; +#ifdef __MINGW32__ +#define GET_OGLFNC_WGL( FncName ) \ +pImplOpenWGLFnc##FncName = (OGLFnc##FncName) GetProcAddress( hImplOGLLib, "wgl" #FncName ); \ +if( !pImplOpenWGLFnc##FncName ) bRet = FALSE; +#else #define GET_OGLFNC_WGL( FncName ) \ pImplOpenWGLFnc##FncName = (OGLFnc##FncName##) GetProcAddress( hImplOGLLib, "wgl" #FncName ); \ if( !pImplOpenWGLFnc##FncName ) bRet = FALSE; +#endif // ----------------- // - Statics init. - --- ./vcl/win/source/app/salshl.cxx.orig 2001-11-09 23:33:28.000000000 +0900 +++ ./vcl/win/source/app/salshl.cxx 2004-01-12 12:52:54.000000000 +0900 @@ -124,7 +124,7 @@ if ( nReason == DLL_PROCESS_ATTACH ) aSalShlData.mhInst = hInst; -#if !defined ( __BORLANDC__ ) +#if !defined ( __BORLANDC__ ) && !defined ( __MINGW32__ ) #ifdef ICC if ( _CRT_init() == -1 ) #else --- ./vcl/source/gdi/outdev3.cxx.orig 2003-08-15 20:24:00.000000000 +0900 +++ ./vcl/source/gdi/outdev3.cxx 2004-01-12 10:32:30.000000000 +0900 @@ -6177,7 +6177,7 @@ nMnemonicWidth = ::abs((int)(lc_x1 - lc_x2)); Point aTempPos = LogicToPixel( aPos ); -#if (_MSC_VER < 1300) +#if (_MSC_VER < 1300) && !defined(__MINGW32__) nMnemonicX = mnOutOffX + aTempPos.X() + ImplLogicWidthToDevicePixel( std::min( lc_x1, lc_x2 ) ); #else nMnemonicX = mnOutOffX + aTempPos.X() + ImplLogicWidthToDevicePixel( min( lc_x1, lc_x2 ) ); @@ -6251,7 +6251,7 @@ nMnemonicWidth = ::abs((int)(lc_x1 - lc_x2)); Point aTempPos = LogicToPixel( aPos ); -#if (_MSC_VER < 1300) +#if (_MSC_VER < 1300) && !defined(__MINGW32__) nMnemonicX = mnOutOffX + aTempPos.X() + ImplLogicWidthToDevicePixel( std::min(lc_x1, lc_x2) ); #else nMnemonicX = mnOutOffX + aTempPos.X() + ImplLogicWidthToDevicePixel( min(lc_x1, lc_x2) ); @@ -6607,7 +6607,7 @@ long lc_x2 = pCaretXArray[ 2*(nMnemonicPos - nIndex)+1 ]; nMnemonicWidth = ::abs((int)(lc_x1 - lc_x2)); -#if (_MSC_VER < 1300) +#if (_MSC_VER < 1300) && !defined(__MINGW32__) Point aTempPos( std::min(lc_x1,lc_x2), GetFontMetric().GetAscent() ); if( bInvalidPos ) // #106952#, place behind the (last) character aTempPos = Point( std::max(lc_x1,lc_x2), GetFontMetric().GetAscent() ); @@ -7094,7 +7094,7 @@ long nXOffset = 0; if( nBase != nIndex ) { -#if (_MSC_VER < 1300) +#if (_MSC_VER < 1300) && !defined(__MINGW32__) xub_StrLen nStart = std::min( nBase, nIndex ); xub_StrLen nOfsLen = std::max( nBase, nIndex ) - nStart; #else @@ -7302,7 +7302,7 @@ long nXOffset = 0; if( nBase != nIndex ) { -#if (_MSC_VER < 1300) +#if (_MSC_VER < 1300) && !defined(__MINGW32__) xub_StrLen nStart = std::min( nBase, nIndex ); xub_StrLen nOfsLen = std::max( nBase, nIndex ) - nStart; #else --- ./vcl/prj/d.lst.orig 2003-05-14 01:12:34.000000000 +0900 +++ ./vcl/prj/d.lst 2004-01-13 00:08:16.000000000 +0900 @@ -14,6 +14,7 @@ ..\%__SRC%\bin\getstyle-gnome %_DEST%\bin%_EXT%\getstyle-gnome ..\%__SRC%\bin\msgbox-gnome %_DEST%\bin%_EXT%\msgbox-gnome ..\%__SRC%\lib\libvcl*.so %_DEST%\lib%_EXT%\libvcl*.so +..\%__SRC%\lib\libvcl*.a %_DEST%\lib%_EXT%\libvcl*.a ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib ..\%__SRC%\lib\app16.lib %_DEST%\lib%_EXT%\app16.lib ..\%__SRC%\lib\gdi16.lib %_DEST%\lib%_EXT%\gdi16.lib --- ./desktop/prj/d.lst.orig 2003-07-17 02:41:00.000000000 +0900 +++ ./desktop/prj/d.lst 2004-01-13 22:07:12.000000000 +0900 @@ -21,13 +21,17 @@ ..\%__SRC%\bin\spl*.dll %_DEST%\bin%_EXT%\spl*.dll ..\%__SRC%\bin\socomp.dll %_DEST%\bin%_EXT%\socomp.dll ..\%__SRC%\lib\libwrp*.so %_DEST%\lib%_EXT%\libwrp*.so +..\%__SRC%\lib\libwrp*.a %_DEST%\lib%_EXT%\libwrp*.a ..\%__SRC%\lib\libwrp*.dylib %_DEST%\lib%_EXT%\libwrp*.dylib ..\%__SRC%\lib\libspl*.so %_DEST%\lib%_EXT%\libspl*.so +..\%__SRC%\lib\libspl*.a %_DEST%\lib%_EXT%\libspl*.a ..\%__SRC%\lib\libspl*.dylib %_DEST%\lib%_EXT%\libspl*.dylib ..\%__SRC%\lib\libsocomp.so %_DEST%\lib%_EXT%\libsocomp.so +..\%__SRC%\lib\libsocomp.a %_DEST%\lib%_EXT%\libsocomp.a ..\%__SRC%\lib\libsocomp.dylib %_DEST%\lib%_EXT%\libsocomp.dylib ..\%__SRC%\bin\offacc*.dll %_DEST%\bin%_EXT%\offacc*.dll ..\%__SRC%\lib\liboffacc*.so %_DEST%\lib%_EXT%\liboffacc*.so +..\%__SRC%\lib\liboffacc*.a %_DEST%\lib%_EXT%\liboffacc*.a ..\%__SRC%\lib\liboffacc*.dylib %_DEST%\lib%_EXT%\liboffacc*.dylib ..\%__SRC%\bin\soffice %_DEST%\bin%_EXT%\soffice.bin @@ -39,6 +43,7 @@ ..\%__SRC%\bin\pkgchk %_DEST%\bin%_EXT%\pkgchk.bin ..\%__SRC%\bin\pkgchk*.dll %_DEST%\bin%_EXT%\pkgchk*.dll ..\%__SRC%\lib\libpkgchk*.so %_DEST%\lib%_EXT%\libpkgchk*.so +..\%__SRC%\lib\libpkgchk*.a %_DEST%\lib%_EXT%\libpkgchk*.a ..\%__SRC%\lib\libpkgchk*.dylib %_DEST%\lib%_EXT%\libpkgchk*.dylib ..\%__SRC%\bin\pagein %_DEST%\bin%_EXT%\pagein --- ./idl/source/prj/svidl.cxx.orig 2000-09-19 01:30:42.000000000 +0900 +++ ./idl/source/prj/svidl.cxx 2003-12-27 15:35:26.000000000 +0900 @@ -141,7 +141,7 @@ |* |* Beschreibung *************************************************************************/ -#if defined( UNX ) || (defined( PM2 ) && defined( CSET )) || defined (WTC) || defined (MAC) || defined (MTW) +#if defined( UNX ) || (defined( PM2 ) && defined( CSET )) || defined (WTC) || defined (MAC) || defined (MTW) || defined (__MINGW32__) int main ( int argc, char ** argv) { #else --- ./offmgr/prj/d.lst.orig 2003-05-28 00:45:32.000000000 +0900 +++ ./offmgr/prj/d.lst 2004-01-13 23:11:30.000000000 +0900 @@ -6,6 +6,7 @@ touch: ..\%__SRC%\misc\ofa.hid %_DEST%\bin%_EXT%\ofa.hid ..\%__SRC%\lib\_ofa.lib %_DEST%\lib%_EXT%\aofa.lib ..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT% +..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT% ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib ..\%__SRC%\slb\ofa.lib %_DEST%\lib%_EXT%\xofa.lib ..\%__SRC%\inc\class.lst %_DEST%\inc%_EXT%\class.lst --- ./connectivity/prj/d.lst.orig 2003-06-02 16:54:00.000000000 +0900 +++ ./connectivity/prj/d.lst 2004-01-13 22:03:00.000000000 +0900 @@ -1,5 +1,6 @@ ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll ..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%\lib*.so +..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT%\lib*.a ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib ..\%__SRC%\slb\connectivity*.* %_DEST%\lib%_EXT%\connectivity*.* ..\%__SRC%\lib\idbt* %_DEST%\lib%_EXT%\idbt* --- ./dbaccess/prj/d.lst.orig 2003-07-17 02:29:30.000000000 +0900 +++ ./dbaccess/prj/d.lst 2004-01-13 22:05:20.000000000 +0900 @@ -1,5 +1,6 @@ ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll ..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT% +..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT% ..\%__SRC%\lib\lib*.dylib %_DEST%\lib%_EXT% ..\%__SRC%\lib\*.sl %_DEST%\lib%_EXT%\*.sl ..\%__SRC%\bin\*.bin %_DEST%\bin%_EXT%\*.bin --- ./i18n/prj/d.lst.orig 2001-09-01 04:09:12.000000000 +0900 +++ ./i18n/prj/d.lst 2004-01-13 23:03:08.000000000 +0900 @@ -2,6 +2,7 @@ ..\%__SRC%\bin\i18n?????.dll %_DEST%\bin%_EXT%\i18n?????.dll ..\%__SRC%\lib\libi18n?????.so %_DEST%\lib%_EXT%\libi18n?????.so +..\%__SRC%\lib\libi18n?????.a %_DEST%\lib%_EXT%\libi18n?????.a ..\%__SRC%\lib\libi18n??????.dylib %_DEST%\lib%_EXT%\libi18n??????.dylib ..\%__SRC%\lib\lib*static*.dylib %_DEST%\lib%_EXT%\lib*static*.dylib --- ./winmingw.set.orig 2003-10-05 00:00:34.000000000 +0900 +++ ./winmingw.set 2004-01-17 23:30:20.000000000 +0900 @@ -1,6 +1,6 @@ # ################################################################# # OpenOffice.org 645 build environment file for: WINNT. -# Generated on: Sun Oct 5 00:00:29 2003 +# Generated on: Sat Jan 17 23:30:09 2004 # Source this file to set up the build environment. # 1. exec (t)csh # 2. source winmingw.set @@ -8,7 +8,7 @@ setenv SRC_ROOT "/cygdrive/d/work/ooo_1.1rc4_src" setenv SHELL "/usr/bin/tcsh" setenv JAVA_HOME "/cygdrive/h/j2sdk1.4.1_03" -setenv ANT_HOME "/cygdrive/h/apache-ant-1.5.4" +setenv ANT_HOME "/cygdrive/h/apache-ant-1.5.4/" setenv JDKLIB "/cygdrive/h/j2sdk1.4.1_03/lib" setenv STLPORT4 "NO_STLPORT4" setenv ASM_PATH "NO_ASM_HOME" @@ -67,7 +67,7 @@ # setenv SOLAR_JAVA "TRUE" setenv COM "GCC" -setenv COMPATH "/cygdrive/h/mingw/bin" +setenv COMPATH "h:/mingw" setenv CPU "I" setenv CPUNAME "INTEL" setenv CVER "C300" @@ -91,7 +91,7 @@ setenv SET_EXCEPTIONS "TRUE" setenv emergency "FALSE" setenv use_shl_versions "TRUE" -setenv WRAPCMD "guw.pl" +setenv WRAPCMD "gum.pl" # # Variable values. @@ -113,7 +113,7 @@ setenv SOLARROOT "$SRC_ROOT" setenv RSCRES "$SRC_ROOT" setenv SOLARVER "/cygdrive/d/work/ooo_1.1rc4_src/solver" -setenv SOLARVERSION "$SOLARVER/645" +setenv SOLARVERSION "d:/work/ooo_1.1rc4_src/solver/645" setenv SOLARENV "/cygdrive/d/work/ooo_1.1rc4_src/solenv" setenv SOLARENVINC "$SOLARENV/inc" setenv LOCALINI "$SOLARENV/config" @@ -127,10 +127,10 @@ setenv DMAKEROOT "$SOLARENVINC/startup" setenv CLASSPATH "$JAVA_HOME/jre/lib/rt.jar:." setenv XCLASSPATH "$JAVA_HOME/jre/lib/rt.jar:." -setenv SOLARINCLUDES " -I/cygdrive/d/work/ooo_1.1rc4_src/solver/inc -I/cygdrive/d/work/ooo_1.1rc4_src/solenv/wntgcci.pro/inc -I/cygdrive/d/work/ooo_1.1rc4_src/solenv/inc -I'/cygdrive/H/SDK/include'" +setenv SOLARINCLUDES "-I/cygdrive/d/work/ooo_1.1rc4_src/solver/inc -I/cygdrive/d/work/ooo_1.1rc4_src/solenv/wntgcci.pro/inc -I/cygdrive/d/work/ooo_1.1rc4_src/solenv/inc -I$COMPATH/include -I/cygdrive/h/mingw/lib/gcc-lib/mingw32/3.3.1/include -I/cygdrive/h/mingw/include/c++/3.3.1 -I/cygdrive/h/mingw/include/c++/3.3.1/mingw32 -I'/cygdrive/H/SDK/include'" setenv PATH ".:$SOLARVER/$UPD/$INPATH/bin:$SOLARENV/bin:$SOLARENV/$OUTPATH/bin:/cygdrive/h/j2sdk1.4.1_03/bin:/cygdrive/h/j2sdk1.4.1_03/jre/bin/client:/cygdrive/h/mingw/bin:/usr/local/bin:/usr/bin:/bin:/cygdrive/h/Perl/bin/:/cygdrive/h/WINDOWS/system32:/cygdrive/h/WINDOWS:/cygdrive/h/WINDOWS/System32/Wbem:/cygdrive/h/Program Files/ATI Technologies/ATI Control Panel:/cygdrive/h/Program Files/Real/Helix Producer Basic:/cygdrive/h/SDK/Bin/.:/cygdrive/h/SDK/Bin/WinNT/.:/cygdrive/h/SDK/Bin/.:/cygdrive/h/SDK/Bin/WinNT/.:/cygdrive/h/usr:/cygdrive/c" -setenv SOLARLIB " -L$SOLARVER/$UPD/$INPATH/lib -L../lib -L$SOLARENV/$OUTPATH/lib" -setenv SOLARINC " -I. -I$SOLARVER/$UPD/$INPATH/inc/stl -I$SOLARVER/$UPD/$INPATH/inc/external -I$SOLARVER/$UPD/$INPATH/inc -I$SOLARENV/$OUTPATH/inc -I$SOLARENV/inc -I$SRC_ROOT/res -I/cygdrive/d/work/ooo_1.1rc4_src/solver/645/wntgcci.pro/inc/stl -I$JAVA_HOME/include/win32 -I$JAVA_HOME/include -I'/cygdrive/H/SDK/include'" +setenv SOLARLIB "-L$SOLARVER/$UPD/$INPATH/lib -L../lib -L$SOLARENV/$OUTPATH/lib" +setenv SOLARINC "-I. -Id:/work/ooo_1.1rc4_src/solver/645/wntgcci.pro/inc/stl -Id:/work/ooo_1.1rc4_src/solver/645/wntgcci.pro/inc/external -Id:/work/ooo_1.1rc4_src/solver/645/wntgcci.pro/inc -Id:/work/ooo_1.1rc4_src/solenv/wntgcci/inc -Id:/work/ooo_1.1rc4_src/solenv/inc -Id:/work/ooo_1.1rc4_src/res -Id:/work/ooo_1.1rc4_src/solver/645/wntgcci.pro/inc/stl -Ih:/j2sdk1.4.1_03/include/win32 -Ih:/j2sdk1.4.1_03/include -Ih:/mingw/include -Ih:/mingw/lib/gcc-lib/mingw32/3.3.1/include -Ih:/mingw/include/c++/3.3.1 -Ih:/mingw/include/c++/3.3.1/mingw32 -Ih:/SDK/include" setenv COMP_ENV "wntgcci" setenv JAVAHOME "$JAVA_HOME" setenv CC "gcc -mno-cygwin" @@ -145,13 +145,13 @@ setenv WITH_LIBSN "NO" setenv LIBSN_CFLAGS "" setenv LIBSN_LIBS "" -setenv GXX_INCLUDE_PATH "h:/mingw/include/c++/3.2.3" +setenv GXX_INCLUDE_PATH "h:/mingw/include/c++/3.3.1" setenv COMMON_BUILD_TOOLS "$SRC_ROOT/external/common" setenv SOLARSRC "d:\\work\\ooo_1.1rc4_src" -setenv LIB ".;d:\\work\\ooo_1.1rc4_src\\solver\\645\\lib;d:\\work\\ooo_1.1rc4_src\\solver\\645\\wntgcci.pro\\lib;d:\\work\\ooo_1.1rc4_src\\solenv\\wntgcci\\lib;h:\\j2sdk1.4.1_03\\lib;h:\\SDK\\lib" -setenv IENV ".;d:\\work\\ooo_1.1rc4_src\\solver\\645\\wntgcci.pro\\inc;d:\\work\\ooo_1.1rc4_src\\solenv\\wntgcci\\inc;d:\\work\\ooo_1.1rc4_src\\solenv\\inc;h:\\SDK\\include;h:\\j2sdk1.4.1_03\\include;h:\\j2sdk1.4.1_03\\include\\win32" -setenv ILIB ".;.;d:\\work\\ooo_1.1rc4_src\\solver\\645\\lib;d:\\work\\ooo_1.1rc4_src\\solver\\645\\wntgcci.pro\\lib;d:\\work\\ooo_1.1rc4_src\\solenv\\wntgcci\\lib;h:\\j2sdk1.4.1_03\\lib;h:\\SDK\\lib" -setenv INCLUDE ".;d:\\work\\ooo_1.1rc4_src\\solver\\645\\wntgcci.pro\\inc;d:\\work\\ooo_1.1rc4_src\\solenv\\wntgcci\\inc;d:\\work\\ooo_1.1rc4_src\\solenv\\inc;h:\\SDK\\include;h:\\j2sdk1.4.1_03\\include;h:\\j2sdk1.4.1_03\\include\\win32" +setenv LIB ".;d:\\work\\ooo_1.1rc4_src\\solver\\645\\lib;d:\\work\\ooo_1.1rc4_src\\solver\\645\\wntgcci.pro\\lib;d:\\work\\ooo_1.1rc4_src\\solenv\\wntgcci\\lib;h:\\j2sdk1.4.1_03\\lib;h:\\mingw\\lib" +setenv IENV ".;d:\\work\\ooo_1.1rc4_src\\solver\\645\\wntgcci.pro\\inc;d:\\work\\ooo_1.1rc4_src\\solenv\\wntgcci\\inc;d:\\work\\ooo_1.1rc4_src\\solenv\\inc;h:\\mingw\\include;h:\\mingw\\lib\\gcc-lib\\mingw32\\3.3.1\\include;h:\\mingw\\include\\c++\\3.3.1;h:\\mingw\\include\\c++\\3.3.1\\mingw32;h:\\SDK\\include;h:\\j2sdk1.4.1_03\\include;h:\\j2sdk1.4.1_03\\include\\win32" +setenv ILIB ".;.;d:/work/ooo_1.1rc4_src/solver/645/lib;d:/work/ooo_1.1rc4_src/solver/645/wntgcci.pro/lib;d:/work/ooo_1.1rc4_src/solenv/wntgcci/lib;h:/j2sdk1.4.1_03/lib;h:/mingw/lib" +setenv INCLUDE ".;d:\\work\\ooo_1.1rc4_src\\solver\\645\\wntgcci.pro\\inc;d:\\work\\ooo_1.1rc4_src\\solenv\\wntgcci\\inc;d:\\work\\ooo_1.1rc4_src\\solenv\\inc;h:\\mingw\\include;h:\\mingw\\lib\\gcc-lib\\mingw32\\3.3.1\\include;h:\\mingw\\include\\c++\\3.3.1;h:\\mingw\\include\\c++\\3.3.1\\mingw32;h:\\SDK\\include;h:\\j2sdk1.4.1_03\\include;h:\\j2sdk1.4.1_03\\include\\win32" setenv GREP "$CYGWIN/grep.exe" setenv FIND "$CYGWIN/find.exe" setenv LS "$CYGWIN/ls.exe"