Merge.

Author: wilx

Makefile.in

@@ -792,9 +792,18 @@ liblog4cplus_la_CPPFLAGS = $(AM_CPPFLAGS) -DINSIDE_LOG4CPLUS
 
 #liblog4cplus_la_LDFLAGS=@LOG4CPLUS_PROFILING_LDFLAGS@
 liblog4cplus_la_SOURCES = $(LIB_SRC)
+@USE_LOG4CPLUS_EXPORT_SYMBOLS_REGEX_FALSE@LOG4CPLUS_EXPORT_SYMBOLS_REGEX = 
+
+# Export symbols in log4cplus namespace but try to avoid symbols in
+# the log4cplus::internal namespace.
+@USE_LOG4CPLUS_EXPORT_SYMBOLS_REGEX_TRUE@LOG4CPLUS_EXPORT_SYMBOLS_REGEX = -export-symbols-regex '9log4cplus[^8][^i][^n]|log4cplus_'
 
 #liblog4cplus_a_LIBADD = @LIBOBJS@ @ALLOCA@
-liblog4cplus_la_LDFLAGS = -no-undefined $(LOG4CPLUS_VERSION_LT_FLAGS) @LOG4CPLUS_PROFILING_LDFLAGS@
+liblog4cplus_la_LDFLAGS = -no-undefined \
+	$(LOG4CPLUS_VERSION_LT_FLAGS) \
+	@LOG4CPLUS_PROFILING_LDFLAGS@ \
+	$(LOG4CPLUS_EXPORT_SYMBOLS_REGEX)
+
 appender_test_SOURCES = tests/appender_test/main.cxx
 appender_test_LDADD = $(liblog4cplus_la_file)
 @MULTI_THREADED_TRUE@configandwatch_test_SOURCES = tests/configandwatch_test/main.cxx

TODO

@@ -1,6 +1,10 @@
 Possible enhancements and directions of development, in no particular
 order:
 
+- Rewrite FileAppender to use OS specific file handling to allow
+  RollingFileAppender to roll log files shared between multiple
+  processes even on Windows.
+
 - Improve error handling
   - allow not to throw exceptions
   - create hooks to allow users to override behaviour

configure

@@ -693,6 +693,8 @@ PTHREAD_CXXFLAGS
 PTHREAD_LIBS
 ax_pthread_config
 EGREP
+USE_LOG4CPLUS_EXPORT_SYMBOLS_REGEX_FALSE
+USE_LOG4CPLUS_EXPORT_SYMBOLS_REGEX_TRUE
 GREP
 SED
 CXXCPP
@@ -7985,11 +7987,22 @@ esac
   *) :
      ;;
 esac
+   use_export_symbols_regex=no
+else
+  use_export_symbols_regex=yes
+fi
+ if test "x$use_export_symbols_regex" = "xyes"; then
+  USE_LOG4CPLUS_EXPORT_SYMBOLS_REGEX_TRUE=
+  USE_LOG4CPLUS_EXPORT_SYMBOLS_REGEX_FALSE='#'
+else
+  USE_LOG4CPLUS_EXPORT_SYMBOLS_REGEX_TRUE='#'
+  USE_LOG4CPLUS_EXPORT_SYMBOLS_REGEX_FALSE=
 fi
 
 
 
 
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C99 variadic macros" >&5
 $as_echo_n "checking for C99 variadic macros... " >&6; }
 if ${ac_cv_c99_variadic_macros+:} false; then :
@@ -23104,6 +23117,10 @@ if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
   as_fn_error $? "conditional \"am__fastdepCXX\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${USE_LOG4CPLUS_EXPORT_SYMBOLS_REGEX_TRUE}" && test -z "${USE_LOG4CPLUS_EXPORT_SYMBOLS_REGEX_FALSE}"; then
+  as_fn_error $? "conditional \"USE_LOG4CPLUS_EXPORT_SYMBOLS_REGEX\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${MULTI_THREADED_TRUE}" && test -z "${MULTI_THREADED_FALSE}"; then
   as_fn_error $? "conditional \"MULTI_THREADED\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5

configure.ac

@@ -308,7 +308,11 @@ AS_IF([test "x$ac_cv_declspec" = "xyes" dnl
     [AX_CXXFLAGS_GCC_OPTION([-fvisibility=hidden])],
 
     [sun],
-    [AX_CXXFLAGS_SUN_OPTION([-xldscope=hidden])])])
+    [AX_CXXFLAGS_SUN_OPTION([-xldscope=hidden])])
+   use_export_symbols_regex=no],
+  [use_export_symbols_regex=yes])
+AM_CONDITIONAL([USE_LOG4CPLUS_EXPORT_SYMBOLS_REGEX],
+  [test "x$use_export_symbols_regex" = "xyes"])
 
 AX_C99_VARIADIC_MACROS
 AH_TEMPLATE([LOG4CPLUS_HAVE_C99_VARIADIC_MACROS])

src/Makefile.am

@@ -138,5 +138,16 @@ liblog4cplus_la_CPPFLAGS = $(AM_CPPFLAGS) -DINSIDE_LOG4CPLUS
 
 liblog4cplus_la_SOURCES = $(LIB_SRC)
 
+if USE_LOG4CPLUS_EXPORT_SYMBOLS_REGEX
+# Export symbols in log4cplus namespace but try to avoid symbols in
+# the log4cplus::internal namespace.
+LOG4CPLUS_EXPORT_SYMBOLS_REGEX = -export-symbols-regex '9log4cplus[^8][^i][^n]|log4cplus_'
+else
+LOG4CPLUS_EXPORT_SYMBOLS_REGEX =
+endif
+
 #liblog4cplus_a_LIBADD = @LIBOBJS@ @ALLOCA@
-liblog4cplus_la_LDFLAGS = -no-undefined $(LOG4CPLUS_VERSION_LT_FLAGS) @LOG4CPLUS_PROFILING_LDFLAGS@
+liblog4cplus_la_LDFLAGS = -no-undefined \
+	$(LOG4CPLUS_VERSION_LT_FLAGS) \
+	@LOG4CPLUS_PROFILING_LDFLAGS@ \
+	$(LOG4CPLUS_EXPORT_SYMBOLS_REGEX)

src/timehelper.cxx

@@ -115,7 +115,11 @@ Time::gettimeofday()
 
 #elif defined (_WIN32)
     FILETIME ft;
+#if _WIN32_WINNT >= 0x602
+    GetSystemTimePreciseAsFileTime (&ft);
+#else
     GetSystemTimeAsFileTime (&ft);
+#endif
 
     typedef unsigned __int64 uint64_type;
     uint64_type st100ns