Index: plugins/opendocument/common/xp/ODc_util.cpp =================================================================== --- plugins/opendocument/common/xp/ODc_util.cpp (revision 31411) +++ plugins/opendocument/common/xp/ODc_util.cpp (working copy) @@ -20,6 +20,7 @@ #include #include "ODc_util.h" #include "ut_std_string.h" +#include "ut_strptime.h" std::string ODc_reorderDate(const std::string &dateStr, bool fromISO) { Index: src/af/util/xp/Makefile.am =================================================================== --- src/af/util/xp/Makefile.am (revision 31411) +++ src/af/util/xp/Makefile.am (working copy) @@ -81,6 +81,7 @@ ut_string.cpp \ ut_string.h \ ut_strptime.c \ + ut_strptime.h \ ut_svg.cpp \ ut_svg.h \ ut_test.cpp \ Index: src/af/util/xp/ut_std_string.cpp =================================================================== --- src/af/util/xp/ut_std_string.cpp (revision 31411) +++ src/af/util/xp/ut_std_string.cpp (working copy) @@ -24,6 +24,7 @@ #include "ut_assert.h" #include "ut_std_string.h" #include "ut_string.h" +#include "ut_strptime.h" #include #include Index: src/af/util/xp/ut_strptime.c =================================================================== --- src/af/util/xp/ut_strptime.c (revision 31411) +++ src/af/util/xp/ut_strptime.c (working copy) @@ -32,6 +32,7 @@ #include #include #include +#include "ut_strptime.h" static int UT_strncasecmp (const char *s1, const char *s2, size_t n) { @@ -861,7 +862,6 @@ return (char *) rp; } - char *UT_strptime (const char *buf, const char *format, struct tm *tmtm) { enum locale_status decided; @@ -872,3 +872,4 @@ #endif return UT_strptime_internal (buf, format, tmtm, &decided); } + Index: src/af/util/xp/ut_string.h =================================================================== --- src/af/util/xp/ut_string.h (revision 31411) +++ src/af/util/xp/ut_string.h (working copy) @@ -165,12 +165,6 @@ ABI_EXPORT void UT_parse_properties(const char * props, std::map & map); -// implemented in UT_strptime.cpp - see strptime() as it is not avail on win. -extern "C" { -ABI_EXPORT char *UT_strptime (const char *buf, const char *format, struct tm *tm); -} - - #ifdef WIN32 #define snprintf _snprintf Index: src/af/util/xp/ut_strptime.h =================================================================== --- src/af/util/xp/ut_strptime.h (revision 0) +++ src/af/util/xp/ut_strptime.h (revision 0) @@ -0,0 +1,30 @@ +// implemented in UT_strptime.c - see strptime() as it is not avail on win. + +#ifdef __cplusplus +extern "C" { +#endif + +#if defined(WIN32) /* && !defined(__MINGW32__) */ + #define ABI_PLUGIN_EXPORT __declspec(dllexport) + #ifdef ABI_DLL + /* we are building an AbiWord plugin and want to use something declared in a library */ + #define ABI_EXPORT __declspec(dllimport) + #else + /* we are building AbiWord and wish for its parts to be used by plugins */ + #define ABI_EXPORT __declspec(dllexport) + #endif +#elif defined (DISABLE_EXPORTS) + /* ignore DISABLE_EXPORTS until we have assigned all symbols proper + * visibility */ + #define ABI_PLUGIN_EXPORT + #define ABI_EXPORT +#else + #define ABI_PLUGIN_EXPORT + #define ABI_EXPORT +#endif + +ABI_EXPORT char * UT_strptime (const char *buf, const char *format, struct tm *tm); + +#ifdef __cplusplus +} +#endif