changeset 2014:e39a2657f1c6

Dropped support of Google Log
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 13 Jun 2016 13:39:10 +0200
parents f6e68c0c2737
children bcc575732aef
files CMakeLists.txt Core/Logging.cpp Core/Logging.h LinuxCompilation.txt NEWS Resources/CMake/GoogleLogConfiguration.cmake Resources/CMake/GoogleLogConfiguration.h Resources/CMake/GoogleLogConfigurationDarwin.h Resources/CMake/GoogleLogConfigurationLSB.h Resources/Patches/glog-port-cc.diff Resources/Patches/glog-port-h-v2.diff Resources/Patches/glog-port-h.diff Resources/Patches/glog-utilities-lsb.diff Resources/Patches/glog-utilities.diff Resources/Patches/glog-visual-studio-port.h Resources/Patches/log4cplus-patch.diff
diffstat 16 files changed, 4 insertions(+), 1138 deletions(-) [+]
line wrap: on
line diff
--- a/CMakeLists.txt	Mon Jun 13 10:26:56 2016 +0200
+++ b/CMakeLists.txt	Mon Jun 13 13:39:10 2016 +0200
@@ -26,7 +26,6 @@
 SET(DCMTK_DICTIONARY_DIR "" CACHE PATH "Directory containing the DCMTK dictionaries \"dicom.dic\" and \"private.dic\" (only when using system version of DCMTK)") 
 SET(ALLOW_DOWNLOADS OFF CACHE BOOL "Allow CMake to download packages")
 SET(UNIT_TESTS_WITH_HTTP_CONNEXIONS ON CACHE BOOL "Allow unit tests to make HTTP requests")
-SET(ENABLE_GOOGLE_LOG OFF CACHE BOOL "Enable Google Log (otherwise, an internal logger is used)")
 SET(ENABLE_JPEG ON CACHE BOOL "Enable JPEG decompression")
 SET(ENABLE_JPEG_LOSSLESS ON CACHE BOOL "Enable JPEG-LS (Lossless) decompression")
 SET(ENABLE_PLUGINS ON CACHE BOOL "Enable plugins")
@@ -36,7 +35,6 @@
 
 # Advanced parameters to fine-tune linking against system libraries
 SET(USE_SYSTEM_JSONCPP ON CACHE BOOL "Use the system version of JsonCpp")
-SET(USE_SYSTEM_GOOGLE_LOG ON CACHE BOOL "Use the system version of Google Log")
 SET(USE_SYSTEM_GOOGLE_TEST ON CACHE BOOL "Use the system version of Google Test")
 SET(USE_SYSTEM_SQLITE ON CACHE BOOL "Use the system version of SQLite")
 SET(USE_SYSTEM_MONGOOSE ON CACHE BOOL "Use the system version of Mongoose")
@@ -287,10 +285,6 @@
 ## Inclusion of third-party dependencies
 #####################################################################
 
-if (ENABLE_GOOGLE_LOG)
-  include(${CMAKE_SOURCE_DIR}/Resources/CMake/GoogleLogConfiguration.cmake)
-endif()
-
 include(${CMAKE_SOURCE_DIR}/Resources/CMake/JsonCppConfiguration.cmake)
 include(${CMAKE_SOURCE_DIR}/Resources/CMake/LibCurlConfiguration.cmake)
 include(${CMAKE_SOURCE_DIR}/Resources/CMake/LibPngConfiguration.cmake)
@@ -416,7 +410,6 @@
 
   ${BOOST_SOURCES}
   ${CURL_SOURCES}
-  ${GOOGLE_LOG_SOURCES}
   ${JSONCPP_SOURCES}
   ${LIBPNG_SOURCES}
   ${LIBJPEG_SOURCES}
--- a/Core/Logging.cpp	Mon Jun 13 10:26:56 2016 +0200
+++ b/Core/Logging.cpp	Mon Jun 13 13:39:10 2016 +0200
@@ -61,61 +61,11 @@
   }
 }
 
-#elif ORTHANC_ENABLE_GOOGLE_LOG == 1
-
-/*********************************************************
- * Wrapper around Google Log
- *********************************************************/
-
-namespace Orthanc
-{  
-  namespace Logging
-  {
-    void Initialize()
-    {
-      // Initialize Google's logging library.
-      FLAGS_logtostderr = true;
-      FLAGS_minloglevel = 1;   // Do not print LOG(INFO) by default
-      FLAGS_v = 0;             // Do not print trace-level VLOG(1) by default
-
-      google::InitGoogleLogging("Orthanc");
-    }
-
-    void Finalize()
-    {
-      google::ShutdownGoogleLogging();
-    }
-
-    void EnableInfoLevel(bool enabled)
-    {
-      FLAGS_minloglevel = (enabled ? 0 : 1);
-    }
-
-    void EnableTraceLevel(bool enabled)
-    {
-      if (enabled)
-      {
-        FLAGS_minloglevel = 0;
-        FLAGS_v = 1;
-      }
-      else
-      {
-        FLAGS_v = 0;
-      }
-    }
-
-    void SetTargetFolder(const std::string& path)
-    {
-      FLAGS_logtostderr = false;
-      FLAGS_log_dir = path;
-    }
-  }
-}
-
 #else
 
 /*********************************************************
- * Use internal logger, not Google Log
+ * Internal logger of Orthanc, that mimics some
+ * behavior from Google Log.
  *********************************************************/
 
 #include "OrthancException.h"
--- a/Core/Logging.h	Mon Jun 13 10:26:56 2016 +0200
+++ b/Core/Logging.h	Mon Jun 13 13:39:10 2016 +0200
@@ -72,16 +72,10 @@
 
 #else  /* ORTHANC_ENABLE_LOGGING == 1 */
 
-#if ORTHANC_ENABLE_GOOGLE_LOG == 1
-#  include <stdlib.h>  // Including this fixes a problem in glog for recent releases of MinGW
-#  include <glog/logging.h>
-#else
 #  include <boost/thread/mutex.hpp>
 #  define LOG(level)  ::Orthanc::Logging::InternalLogger(#level,  __FILE__, __LINE__)
 #  define VLOG(level) ::Orthanc::Logging::InternalLogger("TRACE", __FILE__, __LINE__)
-#endif
 
-#if ORTHANC_ENABLE_GOOGLE_LOG != 1
 namespace Orthanc
 {
   namespace Logging
@@ -107,6 +101,5 @@
     };
   }
 }
-#endif
 
 #endif  // ORTHANC_ENABLE_LOGGING
--- a/LinuxCompilation.txt	Mon Jun 13 10:26:56 2016 +0200
+++ b/LinuxCompilation.txt	Mon Jun 13 13:39:10 2016 +0200
@@ -106,7 +106,6 @@
         -DALLOW_DOWNLOADS=ON \
 	-DUSE_SYSTEM_MONGOOSE=OFF \
 	-DUSE_SYSTEM_JSONCPP=OFF \
-	-DUSE_SYSTEM_GOOGLE_LOG=OFF \
 	-DUSE_SYSTEM_PUGIXML=OFF \
         -DUSE_GTEST_DEBIAN_SOURCE_PACKAGE=ON \
 	~/Orthanc
--- a/NEWS	Mon Jun 13 10:26:56 2016 +0200
+++ b/NEWS	Mon Jun 13 13:39:10 2016 +0200
@@ -56,6 +56,7 @@
 * Macro "__linux" (now obsolete) replaced by macro "__linux__" (maybe solves Debian bug #821011)
 * Modification of instances can now replace PixelData (resp. EncapsulatedDocument) with 
   provided a PNG/JPEG image (resp. PDF file) if it is encoded using Data URI Scheme
+* Dropped support of Google Log
 
 
 Version 1.0.0 (2015/12/15)
@@ -696,7 +697,7 @@
 Version 0.2.2 (2012/10/04)
 ==========================
 
-* Switch to Google Logging
+* Switch to Google Log
 * Fixes to Debian packaging
 
 
--- a/Resources/CMake/GoogleLogConfiguration.cmake	Mon Jun 13 10:26:56 2016 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,197 +0,0 @@
-if (STATIC_BUILD OR NOT USE_SYSTEM_GOOGLE_LOG)
-  SET(GOOGLE_LOG_SOURCES_DIR ${CMAKE_BINARY_DIR}/glog-0.3.2)
-  SET(GOOGLE_LOG_URL "http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/glog-0.3.2.tar.gz")
-  SET(GOOGLE_LOG_MD5 "897fbff90d91ea2b6d6e78c8cea641cc")
-
-  if (IS_DIRECTORY "${GOOGLE_LOG_SOURCES_DIR}")
-    set(FirstRun OFF)
-  else()
-    set(FirstRun ON)
-  endif()
-
-  DownloadPackage(${GOOGLE_LOG_MD5} ${GOOGLE_LOG_URL} "${GOOGLE_LOG_SOURCES_DIR}")
-
-  # Glog 0.3.3 fails to build with old versions of MinGW, such as the
-  # one installed on our Continuous Integration Server that runs
-  # Debian Squeeze. We thus stick to Glog 0.3.2 for the time being.
-
-  #SET(GOOGLE_LOG_SOURCES_DIR ${CMAKE_BINARY_DIR}/glog-0.3.3)
-  #DownloadPackage(
-  #  "a6fd2c22f8996846e34c763422717c18"
-  #  "http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/glog-0.3.3.tar.gz"
-  #  "${GOOGLE_LOG_SOURCES_DIR}")
-
-
-  set(GOOGLE_LOG_HEADERS
-    ${GOOGLE_LOG_SOURCES_DIR}/src/glog/logging.h
-    ${GOOGLE_LOG_SOURCES_DIR}/src/glog/raw_logging.h
-    ${GOOGLE_LOG_SOURCES_DIR}/src/glog/stl_logging.h
-    ${GOOGLE_LOG_SOURCES_DIR}/src/glog/vlog_is_on.h
-    )
-
-  set(ac_google_namespace google)
-  set(ac_google_start_namespace "namespace google {")
-  set(ac_google_end_namespace "}")
-
-  if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR
-      ${CMAKE_SYSTEM_NAME} STREQUAL "Darwin" OR
-      ${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD" OR
-      ${CMAKE_SYSTEM_NAME} STREQUAL "kFreeBSD")
-    set(ac_cv_have_unistd_h 1)
-    set(ac_cv_have_stdint_h 1)
-    set(ac_cv_have_systypes_h 0)
-    set(ac_cv_have_inttypes_h 0)
-    set(ac_cv_have_libgflags 0)
-    set(ac_cv_have_uint16_t 1)
-    set(ac_cv_have_u_int16_t 0)
-    set(ac_cv_have___uint16 0)
-    set(ac_cv_cxx_using_operator 1)
-    set(ac_cv_have___builtin_expect 1)
-  else()
-    set(ac_cv_have_unistd_h 0)
-    set(ac_cv_have_stdint_h 0)
-    set(ac_cv_have_systypes_h 0)
-    set(ac_cv_have_inttypes_h 0)
-    set(ac_cv_have_libgflags 0)
-    set(ac_cv_have_uint16_t 0)
-    set(ac_cv_have_u_int16_t 0)
-    set(ac_cv_have___uint16 1)
-    set(ac_cv_cxx_using_operator 1)
-    set(ac_cv_have___builtin_expect 0)
-  endif()
-
-  foreach (f ${GOOGLE_LOG_HEADERS})
-    configure_file(${f}.in ${f})
-  endforeach()
-
-  include_directories(
-    ${GOOGLE_LOG_SOURCES_DIR}/src
-    )
-
-  if (CMAKE_COMPILER_IS_GNUCXX)
-    if ("${CMAKE_SYSTEM_VERSION}" STREQUAL "LinuxStandardBase")
-      execute_process(
-        COMMAND ${PATCH_EXECUTABLE} -N utilities.cc -i ${ORTHANC_ROOT}/Resources/Patches/glog-utilities-lsb.diff
-        WORKING_DIRECTORY ${GOOGLE_LOG_SOURCES_DIR}/src
-        RESULT_VARIABLE Failure
-        )
-    else()
-      execute_process(
-        COMMAND ${PATCH_EXECUTABLE} -N utilities.cc -i ${ORTHANC_ROOT}/Resources/Patches/glog-utilities.diff
-        WORKING_DIRECTORY ${GOOGLE_LOG_SOURCES_DIR}/src
-        RESULT_VARIABLE Failure
-        )
-    endif()
-
-    if (Failure AND FirstRun)
-      message(FATAL_ERROR "Error while patching a file")
-    endif()
-
-    # Patches for MinGW
-    execute_process(
-      #COMMAND ${PATCH_EXECUTABLE} -N port.h -i ${ORTHANC_ROOT}/Resources/Patches/glog-port-h.diff 
-      COMMAND ${PATCH_EXECUTABLE} -N port.h -i ${ORTHANC_ROOT}/Resources/Patches/glog-port-h-v2.diff 
-      WORKING_DIRECTORY ${GOOGLE_LOG_SOURCES_DIR}/src/windows
-      RESULT_VARIABLE Failure
-      )
-
-    if (Failure AND FirstRun)
-      message(FATAL_ERROR "Error while patching a file")
-    endif()
-
-    execute_process(
-      COMMAND ${PATCH_EXECUTABLE} -N port.cc -i ${ORTHANC_ROOT}/Resources/Patches/glog-port-cc.diff 
-      WORKING_DIRECTORY ${GOOGLE_LOG_SOURCES_DIR}/src/windows
-      RESULT_VARIABLE Failure
-      )
-
-    if (Failure AND FirstRun)
-      message(FATAL_ERROR "Error while patching a file")
-    endif()
-
-  elseif (MSVC)
-    # https://code.google.com/p/google-glog/issues/detail?id=117
-    configure_file(
-      ${ORTHANC_ROOT}/Resources/Patches/glog-visual-studio-port.h
-      ${GOOGLE_LOG_SOURCES_DIR}/src/windows/port.h
-      COPYONLY)
-
-  endif()
-
-
-  if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR
-      ${CMAKE_SYSTEM_NAME} STREQUAL "Darwin" OR
-      ${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD" OR
-      ${CMAKE_SYSTEM_NAME} STREQUAL "kFreeBSD")
-    if ("${CMAKE_SYSTEM_VERSION}" STREQUAL "LinuxStandardBase")
-      # Install the specific configuration for LSB SDK
-      configure_file(
-        ${ORTHANC_ROOT}/Resources/CMake/GoogleLogConfigurationLSB.h
-        ${GOOGLE_LOG_SOURCES_DIR}/src/config.h
-        COPYONLY)
-    elseif ("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")
-      # Install the specific configuration for Mac OS
-      configure_file(
-        ${ORTHANC_ROOT}/Resources/CMake/GoogleLogConfigurationDarwin.h
-        ${GOOGLE_LOG_SOURCES_DIR}/src/config.h
-        COPYONLY)
-    else()
-      configure_file(
-        ${ORTHANC_ROOT}/Resources/CMake/GoogleLogConfiguration.h
-        ${GOOGLE_LOG_SOURCES_DIR}/src/config.h
-        COPYONLY)
-    endif()
-
-    set(GOOGLE_LOG_SOURCES
-      ${GOOGLE_LOG_SOURCES_DIR}/src/demangle.cc
-      ${GOOGLE_LOG_SOURCES_DIR}/src/logging.cc
-      ${GOOGLE_LOG_SOURCES_DIR}/src/raw_logging.cc
-      ${GOOGLE_LOG_SOURCES_DIR}/src/signalhandler.cc
-      ${GOOGLE_LOG_SOURCES_DIR}/src/symbolize.cc
-      ${GOOGLE_LOG_SOURCES_DIR}/src/utilities.cc
-      ${GOOGLE_LOG_SOURCES_DIR}/src/vlog_is_on.cc
-      )
-
-  elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
-    include_directories(
-      ${GOOGLE_LOG_SOURCES_DIR}/src/windows
-      )
-
-    set(GOOGLE_LOG_SOURCES
-      ${GOOGLE_LOG_SOURCES_DIR}/src/windows/port.cc
-      ${GOOGLE_LOG_SOURCES_DIR}/src/logging.cc
-      ${GOOGLE_LOG_SOURCES_DIR}/src/raw_logging.cc
-      ${GOOGLE_LOG_SOURCES_DIR}/src/utilities.cc
-      ${GOOGLE_LOG_SOURCES_DIR}/src/vlog_is_on.cc
-      )
-
-    add_definitions(
-      -DGLOG_NO_ABBREVIATED_SEVERITIES=1
-      -DNO_FRAME_POINTER=1
-      -DGOOGLE_GLOG_DLL_DECL=
-      )
-
-    if (CMAKE_COMPILER_IS_GNUCXX)
-      # This is a patch for MinGW64
-      add_definitions(-D_TIME_H__S=1)
-    endif()
-  endif()
-
-else()
-  CHECK_INCLUDE_FILE_CXX(glog/logging.h HAVE_GOOGLE_LOG_H)
-  if (NOT HAVE_GOOGLE_LOG_H)
-    message(FATAL_ERROR "Please install the libgoogle-glog-dev package")
-  endif()
-
-  link_libraries(glog)
-endif()
-
-
-CHECK_INCLUDE_FILES(sec_api/string_s.h HAVE_SECURE_STRING_EXTENSIONS)
-if (HAVE_SECURE_STRING_EXTENSIONS)
-  add_definitions(-DHAVE_SECURE_STRING_EXTENSIONS=1)
-else()
-  add_definitions(-DHAVE_SECURE_STRING_EXTENSIONS=0)
-endif()
-
-add_definitions(-DORTHANC_ENABLE_GOOGLE_LOG=1)
--- a/Resources/CMake/GoogleLogConfiguration.h	Mon Jun 13 10:26:56 2016 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,175 +0,0 @@
-/* src/config.h.  Generated from config.h.in by configure.  */
-/* src/config.h.in.  Generated from configure.ac by autoheader.  */
-
-/* Namespace for Google classes */
-#define GOOGLE_NAMESPACE google
-
-/* Define if you have the `dladdr' function */
-/* #undef HAVE_DLADDR */
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#define HAVE_DLFCN_H 1
-
-/* Define to 1 if you have the <execinfo.h> header file. */
-#define HAVE_EXECINFO_H 1
-
-/* Define if you have the `fcntl' function */
-#define HAVE_FCNTL 1
-
-/* Define to 1 if you have the <glob.h> header file. */
-#define HAVE_GLOB_H 1
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#define HAVE_INTTYPES_H 1
-
-/* Define to 1 if you have the `pthread' library (-lpthread). */
-#define HAVE_LIBPTHREAD 1
-
-/* Define to 1 if you have the <libunwind.h> header file. */
-/* #undef HAVE_LIBUNWIND_H */
-
-/* define if you have google gflags library */
-/* #undef HAVE_LIB_GFLAGS */
-
-/* define if you have google gmock library */
-/* #undef HAVE_LIB_GMOCK */
-
-/* define if you have google gtest library */
-/* #undef HAVE_LIB_GTEST */
-
-/* define if you have libunwind */
-/* #undef HAVE_LIB_UNWIND */
-
-/* Define to 1 if you have the <memory.h> header file. */
-#define HAVE_MEMORY_H 1
-
-/* define if the compiler implements namespaces */
-#define HAVE_NAMESPACES 1
-
-/* Define if you have POSIX threads libraries and header files. */
-#define HAVE_PTHREAD 1
-
-/* Define to 1 if you have the <pwd.h> header file. */
-#define HAVE_PWD_H 1
-
-/* define if the compiler implements pthread_rwlock_* */
-#define HAVE_RWLOCK 1
-
-/* Define if you have the `sigaltstack' function */
-#define HAVE_SIGALTSTACK 1
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#define HAVE_STDINT_H 1
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H 1
-
-/* Define to 1 if you have the <strings.h> header file. */
-#define HAVE_STRINGS_H 1
-
-/* Define to 1 if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
-/* Define to 1 if you have the <syscall.h> header file. */
-#define HAVE_SYSCALL_H 1
-
-/* Define to 1 if you have the <syslog.h> header file. */
-#define HAVE_SYSLOG_H 1
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#define HAVE_SYS_STAT_H 1
-
-/* Define to 1 if you have the <sys/syscall.h> header file. */
-#define HAVE_SYS_SYSCALL_H 1
-
-/* Define to 1 if you have the <sys/time.h> header file. */
-#define HAVE_SYS_TIME_H 1
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#define HAVE_SYS_TYPES_H 1
-
-/* Define to 1 if you have the <sys/ucontext.h> header file. */
-#define HAVE_SYS_UCONTEXT_H 1
-
-/* Define to 1 if you have the <sys/utsname.h> header file. */
-#define HAVE_SYS_UTSNAME_H 1
-
-/* Define to 1 if you have the <ucontext.h> header file. */
-#define HAVE_UCONTEXT_H 1
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#define HAVE_UNISTD_H 1
-
-/* define if the compiler supports using expression for operator */
-#define HAVE_USING_OPERATOR 1
-
-/* define if your compiler has __attribute__ */
-#define HAVE___ATTRIBUTE__ 1
-
-/* define if your compiler has __builtin_expect */
-#define HAVE___BUILTIN_EXPECT 1
-
-/* define if your compiler has __sync_val_compare_and_swap */
-#define HAVE___SYNC_VAL_COMPARE_AND_SWAP 1
-
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
-   */
-#define LT_OBJDIR ".libs/"
-
-/* Name of package */
-#define PACKAGE "glog"
-
-/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "opensource@google.com"
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME "glog"
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "glog 0.3.2"
-
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME "glog"
-
-/* Define to the home page for this package. */
-#define PACKAGE_URL ""
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION "0.3.2"
-
-/* How to access the PC from a struct ucontext */
-/*#include <ucontext.h>
-#include <sys/ucontext.h>
-#ifdef REG_RIP
-#define PC_FROM_UCONTEXT uc_mcontext.gregs[REG_RIP]
-#else
-#undef PC_FROM_UCONTEXT
-#endif*/
-
-// This is required for older versions of Linux
-#undef PC_FROM_UCONTEXT
-
-/* Define to necessary symbol if this constant uses a non-standard name on
-   your system. */
-/* #undef PTHREAD_CREATE_JOINABLE */
-
-/* The size of `void *', as computed by sizeof. */
-#define SIZEOF_VOID_P 8
-
-/* Define to 1 if you have the ANSI C header files. */
-/* #undef STDC_HEADERS */
-
-/* the namespace where STL code like vector<> is defined */
-#define STL_NAMESPACE std
-
-/* location of source code */
-#define TEST_SRC_DIR "."
-
-/* Version number of package */
-#define VERSION "0.3.2"
-
-/* Stops putting the code inside the Google namespace */
-#define _END_GOOGLE_NAMESPACE_ }
-
-/* Puts following code inside the Google namespace */
-#define _START_GOOGLE_NAMESPACE_ namespace google {
--- a/Resources/CMake/GoogleLogConfigurationDarwin.h	Mon Jun 13 10:26:56 2016 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,175 +0,0 @@
-/* src/config.h.  Generated from config.h.in by configure.  */
-/* src/config.h.in.  Generated from configure.ac by autoheader.  */
-
-/* Namespace for Google classes */
-#define GOOGLE_NAMESPACE google
-
-/* Define if you have the `dladdr' function */
-/* #undef HAVE_DLADDR */
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#define HAVE_DLFCN_H 1
-
-/* Define to 1 if you have the <execinfo.h> header file. */
-#define HAVE_EXECINFO_H 1
-
-/* Define if you have the `fcntl' function */
-#define HAVE_FCNTL 1
-
-/* Define to 1 if you have the <glob.h> header file. */
-#define HAVE_GLOB_H 1
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#define HAVE_INTTYPES_H 1
-
-/* Define to 1 if you have the `pthread' library (-lpthread). */
-#define HAVE_LIBPTHREAD 1
-
-/* Define to 1 if you have the <libunwind.h> header file. */
-/* #undef HAVE_LIBUNWIND_H */
-
-/* define if you have google gflags library */
-/* #undef HAVE_LIB_GFLAGS */
-
-/* define if you have google gmock library */
-/* #undef HAVE_LIB_GMOCK */
-
-/* define if you have google gtest library */
-/* #undef HAVE_LIB_GTEST */
-
-/* define if you have libunwind */
-/* #undef HAVE_LIB_UNWIND */
-
-/* Define to 1 if you have the <memory.h> header file. */
-#define HAVE_MEMORY_H 1
-
-/* define if the compiler implements namespaces */
-#define HAVE_NAMESPACES 1
-
-/* Define if you have POSIX threads libraries and header files. */
-#define HAVE_PTHREAD 1
-
-/* Define to 1 if you have the <pwd.h> header file. */
-#define HAVE_PWD_H 1
-
-/* define if the compiler implements pthread_rwlock_* */
-#define HAVE_RWLOCK 1
-
-/* Define if you have the `sigaltstack' function */
-#define HAVE_SIGALTSTACK 1
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#define HAVE_STDINT_H 1
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H 1
-
-/* Define to 1 if you have the <strings.h> header file. */
-#define HAVE_STRINGS_H 1
-
-/* Define to 1 if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
-/* Define to 1 if you have the <syscall.h> header file. */
-/* #undef HAVE_SYSCALL_H */
-
-/* Define to 1 if you have the <syslog.h> header file. */
-#define HAVE_SYSLOG_H 1
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-/* #define HAVE_SYS_STAT_H 1 */
-
-/* Define to 1 if you have the <sys/syscall.h> header file. */
-#define HAVE_SYS_SYSCALL_H 1
-
-/* Define to 1 if you have the <sys/time.h> header file. */
-#define HAVE_SYS_TIME_H 1
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-/* #define HAVE_SYS_TYPES_H 1 */
-
-/* Define to 1 if you have the <sys/ucontext.h> header file. */
-/* #define HAVE_SYS_UCONTEXT_H 1 */
-
-/* Define to 1 if you have the <sys/utsname.h> header file. */
-#define HAVE_SYS_UTSNAME_H 1
-
-/* Define to 1 if you have the <ucontext.h> header file. */
-#define HAVE_UCONTEXT_H 1
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#define HAVE_UNISTD_H 1
-
-/* define if the compiler supports using expression for operator */
-#define HAVE_USING_OPERATOR 1
-
-/* define if your compiler has __attribute__ */
-#define HAVE___ATTRIBUTE__ 1
-
-/* define if your compiler has __builtin_expect */
-#define HAVE___BUILTIN_EXPECT 1
-
-/* define if your compiler has __sync_val_compare_and_swap */
-#define HAVE___SYNC_VAL_COMPARE_AND_SWAP 1
-
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
-   */
-#define LT_OBJDIR ".libs/"
-
-/* Name of package */
-#define PACKAGE "glog"
-
-/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "opensource@google.com"
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME "glog"
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "glog 0.3.2"
-
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME "glog"
-
-/* Define to the home page for this package. */
-#define PACKAGE_URL ""
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION "0.3.2"
-
-/* How to access the PC from a struct ucontext */
-/*#include <ucontext.h>
-#include <sys/ucontext.h>
-#ifdef REG_RIP
-#define PC_FROM_UCONTEXT uc_mcontext.gregs[REG_RIP]
-#else
-#undef PC_FROM_UCONTEXT
-#endif*/
-
-// This is required for older versions of Linux
-#undef PC_FROM_UCONTEXT
-
-/* Define to necessary symbol if this constant uses a non-standard name on
-   your system. */
-/* #undef PTHREAD_CREATE_JOINABLE */
-
-/* The size of `void *', as computed by sizeof. */
-#define SIZEOF_VOID_P 8
-
-/* Define to 1 if you have the ANSI C header files. */
-/* #undef STDC_HEADERS */
-
-/* the namespace where STL code like vector<> is defined */
-#define STL_NAMESPACE std
-
-/* location of source code */
-#define TEST_SRC_DIR "."
-
-/* Version number of package */
-#define VERSION "0.3.2"
-
-/* Stops putting the code inside the Google namespace */
-#define _END_GOOGLE_NAMESPACE_ }
-
-/* Puts following code inside the Google namespace */
-#define _START_GOOGLE_NAMESPACE_ namespace google {
--- a/Resources/CMake/GoogleLogConfigurationLSB.h	Mon Jun 13 10:26:56 2016 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,175 +0,0 @@
-/* src/config.h.  Generated from config.h.in by configure.  */
-/* src/config.h.in.  Generated from configure.ac by autoheader.  */
-
-/* Namespace for Google classes */
-#define GOOGLE_NAMESPACE google
-
-/* Define if you have the `dladdr' function */
-/* #undef HAVE_DLADDR */
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#define HAVE_DLFCN_H 1
-
-/* Define to 1 if you have the <execinfo.h> header file. */
-#define HAVE_EXECINFO_H 1
-
-/* Define if you have the `fcntl' function */
-#define HAVE_FCNTL 1
-
-/* Define to 1 if you have the <glob.h> header file. */
-#define HAVE_GLOB_H 1
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#define HAVE_INTTYPES_H 1
-
-/* Define to 1 if you have the `pthread' library (-lpthread). */
-#define HAVE_LIBPTHREAD 1
-
-/* Define to 1 if you have the <libunwind.h> header file. */
-/* #undef HAVE_LIBUNWIND_H */
-
-/* define if you have google gflags library */
-/* #undef HAVE_LIB_GFLAGS */
-
-/* define if you have google gmock library */
-/* #undef HAVE_LIB_GMOCK */
-
-/* define if you have google gtest library */
-/* #undef HAVE_LIB_GTEST */
-
-/* define if you have libunwind */
-/* #undef HAVE_LIB_UNWIND */
-
-/* Define to 1 if you have the <memory.h> header file. */
-#define HAVE_MEMORY_H 1
-
-/* define if the compiler implements namespaces */
-#define HAVE_NAMESPACES 1
-
-/* Define if you have POSIX threads libraries and header files. */
-#define HAVE_PTHREAD 1
-
-/* Define to 1 if you have the <pwd.h> header file. */
-#define HAVE_PWD_H 1
-
-/* define if the compiler implements pthread_rwlock_* */
-#define HAVE_RWLOCK 1
-
-/* Define if you have the `sigaltstack' function */
-#define HAVE_SIGALTSTACK 1
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#define HAVE_STDINT_H 1
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H 1
-
-/* Define to 1 if you have the <strings.h> header file. */
-#define HAVE_STRINGS_H 1
-
-/* Define to 1 if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
-/* Define to 1 if you have the <syscall.h> header file. */
-/* #undef HAVE_SYSCALL_H */
-
-/* Define to 1 if you have the <syslog.h> header file. */
-#define HAVE_SYSLOG_H 1
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#define HAVE_SYS_STAT_H 1
-
-/* Define to 1 if you have the <sys/syscall.h> header file. */
-/* #undef HAVE_SYS_SYSCALL_H */
-
-/* Define to 1 if you have the <sys/time.h> header file. */
-#define HAVE_SYS_TIME_H 1
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#define HAVE_SYS_TYPES_H 1
-
-/* Define to 1 if you have the <sys/ucontext.h> header file. */
-/* #define HAVE_SYS_UCONTEXT_H 1 */
-
-/* Define to 1 if you have the <sys/utsname.h> header file. */
-#define HAVE_SYS_UTSNAME_H 1
-
-/* Define to 1 if you have the <ucontext.h> header file. */
-/* #define HAVE_UCONTEXT_H 1 */
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#define HAVE_UNISTD_H 1
-
-/* define if the compiler supports using expression for operator */
-#define HAVE_USING_OPERATOR 1
-
-/* define if your compiler has __attribute__ */
-#define HAVE___ATTRIBUTE__ 1
-
-/* define if your compiler has __builtin_expect */
-#define HAVE___BUILTIN_EXPECT 1
-
-/* define if your compiler has __sync_val_compare_and_swap */
-#define HAVE___SYNC_VAL_COMPARE_AND_SWAP 1
-
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
-   */
-#define LT_OBJDIR ".libs/"
-
-/* Name of package */
-#define PACKAGE "glog"
-
-/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "opensource@google.com"
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME "glog"
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "glog 0.3.2"
-
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME "glog"
-
-/* Define to the home page for this package. */
-#define PACKAGE_URL ""
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION "0.3.2"
-
-/* How to access the PC from a struct ucontext */
-/*#include <ucontext.h>
-#include <sys/ucontext.h>
-#ifdef REG_RIP
-#define PC_FROM_UCONTEXT uc_mcontext.gregs[REG_RIP]
-#else
-#undef PC_FROM_UCONTEXT
-#endif*/
-
-// This is required for older versions of Linux
-#undef PC_FROM_UCONTEXT
-
-/* Define to necessary symbol if this constant uses a non-standard name on
-   your system. */
-/* #undef PTHREAD_CREATE_JOINABLE */
-
-/* The size of `void *', as computed by sizeof. */
-#define SIZEOF_VOID_P 8
-
-/* Define to 1 if you have the ANSI C header files. */
-/* #undef STDC_HEADERS */
-
-/* the namespace where STL code like vector<> is defined */
-#define STL_NAMESPACE std
-
-/* location of source code */
-#define TEST_SRC_DIR "."
-
-/* Version number of package */
-#define VERSION "0.3.2"
-
-/* Stops putting the code inside the Google namespace */
-#define _END_GOOGLE_NAMESPACE_ }
-
-/* Puts following code inside the Google namespace */
-#define _START_GOOGLE_NAMESPACE_ namespace google {
--- a/Resources/Patches/glog-port-cc.diff	Mon Jun 13 10:26:56 2016 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
---- i/glog-0.3.2/src/windows/port.cc	2011-08-30 09:56:13.000000000 +0200
-+++ port.cc	2012-10-03 17:11:54.000000000 +0200
-@@ -55,6 +55,7 @@
-   return _vsnprintf(str, size-1, format, ap);
- }
- 
-+#if !defined(__MINGW32__)
- int snprintf(char *str, size_t size, const char *format, ...) {
-   va_list ap;
-   va_start(ap, format);
-@@ -62,3 +63,4 @@
-   va_end(ap);
-   return r;
- }
-+#endif
--- a/Resources/Patches/glog-port-h-v2.diff	Mon Jun 13 10:26:56 2016 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-124,130c124,146
-< // ----------------------------------- THREADS
-< typedef DWORD pthread_t;
-< typedef DWORD pthread_key_t;
-< typedef LONG pthread_once_t;
-< enum { PTHREAD_ONCE_INIT = 0 };   // important that this be 0! for SpinLock
-< #define pthread_self  GetCurrentThreadId
-< #define pthread_equal(pthread_t_1, pthread_t_2)  ((pthread_t_1)==(pthread_t_2))
----
-> // ----------------------------------- SECURE STRINGS
-> 
-> #if HAVE_SECURE_STRING_EXTENSIONS == 0
-> // Emulation of "localtime_s" and "strerror_s" for old versions of MinGW
-> inline int localtime_s(tm * _tm, const time_t * time)
-> {
->   tm * posix_local_time_struct = localtime(time);
->   if (posix_local_time_struct == NULL) 
->   {
->     return 1;
->   }
-> 
->   *_tm = *posix_local_time_struct;
-> 
->   return 0;
-> }
-> 
-> inline char* strerror_s(char* buf, size_t buflen, int errnum) 
-> {
->   const char* str = strerror(errnum);
->   return strncpy(buf, str, buflen - 1);
-> }
-> #endif
-131a148,149
-> 
-> #if !defined(__MINGW32__) || HAVE_SECURE_STRING_EXTENSIONS == 0
-135a154,155
-> #endif
-> 
-140a161,173
-> 
-> 
-> // ----------------------------------- THREADS
-> 
-> #if !defined(__MINGW32__) || HAVE_WIN_PTHREAD == 0
-> typedef DWORD pthread_t;
-> typedef DWORD pthread_key_t;
-> typedef LONG pthread_once_t;
-> enum { PTHREAD_ONCE_INIT = 0 };   // important that this be 0! for SpinLock
-> #define pthread_self  GetCurrentThreadId
-> #define pthread_equal(pthread_t_1, pthread_t_2)  ((pthread_t_1)==(pthread_t_2))
-> #endif
-> 
--- a/Resources/Patches/glog-port-h.diff	Mon Jun 13 10:26:56 2016 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
---- /tmp/m/glog-0.3.2/src/windows/port.h	2012-10-03 12:54:10.958149861 +0200
-+++ port.h	2012-10-03 16:19:56.721837994 +0200
-@@ -129,6 +129,27 @@
- #define pthread_self  GetCurrentThreadId
- #define pthread_equal(pthread_t_1, pthread_t_2)  ((pthread_t_1)==(pthread_t_2))
- 
-+#if defined(__MINGW32__)
-+inline int localtime_s(tm * _tm, const time_t * time)
-+{
-+  tm * posix_local_time_struct = localtime(time);
-+  if (posix_local_time_struct == NULL) 
-+  {
-+    return 1;
-+  }
-+
-+  *_tm = *posix_local_time_struct;
-+
-+  return 0;
-+}
-+
-+inline char* strerror_s(char* buf, size_t buflen, int errnum) 
-+{
-+  const char* str = strerror(errnum);
-+  return strncpy(buf, str, buflen - 1);
-+}
-+#endif
-+
- inline struct tm* localtime_r(const time_t* timep, struct tm* result) {
-   localtime_s(result, timep);
-   return result;
--- a/Resources/Patches/glog-utilities-lsb.diff	Mon Jun 13 10:26:56 2016 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
---- utilities.cc.orig	2012-01-12 09:40:21.000000000 +0100
-+++ utilities.cc	2013-09-23 17:37:35.033275313 +0200
-@@ -233,40 +233,7 @@
- }
- 
- pid_t GetTID() {
--  // On Linux and FreeBSD, we try to use gettid().
--#if defined OS_LINUX || defined OS_FREEBSD || defined OS_MACOSX
--#ifndef __NR_gettid
--#ifdef OS_MACOSX
--#define __NR_gettid SYS_gettid
--#elif ! defined __i386__
--#error "Must define __NR_gettid for non-x86 platforms"
--#else
--#define __NR_gettid 224
--#endif
--#endif
--  static bool lacks_gettid = false;
--  if (!lacks_gettid) {
--    pid_t tid = syscall(__NR_gettid);
--    if (tid != -1) {
--      return tid;
--    }
--    // Technically, this variable has to be volatile, but there is a small
--    // performance penalty in accessing volatile variables and there should
--    // not be any serious adverse effect if a thread does not immediately see
--    // the value change to "true".
--    lacks_gettid = true;
--  }
--#endif  // OS_LINUX || OS_FREEBSD
--
--  // If gettid() could not be used, we use one of the following.
--#if defined OS_LINUX
--  return getpid();  // Linux:  getpid returns thread ID when gettid is absent
--#elif defined OS_WINDOWS || defined OS_CYGWIN
--  return GetCurrentThreadId();
--#else
--  // If none of the techniques above worked, we use pthread_self().
-   return (pid_t)(uintptr_t)pthread_self();
--#endif
- }
- 
- const char* const_basename(const char* filepath) {
-@@ -295,7 +262,7 @@
-     g_my_user_name = "invalid-user";
-   }
- }
--REGISTER_MODULE_INITIALIZER(utilities, MyUserNameInitializer());
-+REGISTER_MODULE_INITIALIZER(utilities, MyUserNameInitializer())
- 
- #ifdef HAVE_STACKTRACE
- void DumpStackTraceToString(string* stacktrace) {
--- a/Resources/Patches/glog-utilities.diff	Mon Jun 13 10:26:56 2016 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
---- /tmp/m/glog-0.3.2/src/utilities.cc	2012-01-12 09:40:21.000000000 +0100
-+++ utilities.cc	2012-10-03 16:04:19.745861665 +0200
-@@ -295,7 +295,7 @@
-     g_my_user_name = "invalid-user";
-   }
- }
-+REGISTER_MODULE_INITIALIZER(utilities, MyUserNameInitializer())
--REGISTER_MODULE_INITIALIZER(utilities, MyUserNameInitializer());
- 
- #ifdef HAVE_STACKTRACE
- void DumpStackTraceToString(string* stacktrace) {
--- a/Resources/Patches/glog-visual-studio-port.h	Mon Jun 13 10:26:56 2016 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,178 +0,0 @@
-/* Copyright (c) 2008, Google Inc.
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * ---
- * Author: Craig Silverstein
- * Copied from google-perftools and modified by Shinichiro Hamaji
- *
- * These are some portability typedefs and defines to make it a bit
- * easier to compile this code under VC++.
- *
- * Several of these are taken from glib:
- *    http://developer.gnome.org/doc/API/glib/glib-windows-compatability-functions.html
- */
-
-#ifndef CTEMPLATE_WINDOWS_PORT_H_
-#define CTEMPLATE_WINDOWS_PORT_H_
-
-#include "config.h"
-
-#ifdef _WIN32
-
-#define WIN32_LEAN_AND_MEAN  /* We always want minimal includes */
-#include <windows.h>
-#include <winsock.h>         /* for gethostname */
-#include <io.h>              /* because we so often use open/close/etc */
-#include <direct.h>          /* for _getcwd() */
-#include <process.h>         /* for _getpid() */
-#include <stdio.h>           /* read in vsnprintf decl. before redifining it */
-#include <stdarg.h>          /* template_dictionary.cc uses va_copy */
-#include <string.h>          /* for _strnicmp(), strerror_s() */
-#include <time.h>            /* for localtime_s() */
-/* Note: the C++ #includes are all together at the bottom.  This file is
- * used by both C and C++ code, so we put all the C++ together.
- */
-
-// Fix by Sebastien Jodogne for Visual Studio 2013
-// https://code.google.com/p/google-glog/issues/detail?id=212
-#if defined(_MSC_VER) && (_MSC_VER >= 1800)
-#include <algorithm>
-#endif
-
-/* 4244: otherwise we get problems when substracting two size_t's to an int
- * 4251: it's complaining about a private struct I've chosen not to dllexport
- * 4355: we use this in a constructor, but we do it safely
- * 4715: for some reason VC++ stopped realizing you can't return after abort()
- * 4800: we know we're casting ints/char*'s to bools, and we're ok with that
- * 4996: Yes, we're ok using "unsafe" functions like fopen() and strerror()
- */
-#pragma warning(disable:4244 4251 4355 4715 4800 4996)
-
-/* file I/O */
-#define PATH_MAX 1024
-#define access  _access
-#define getcwd  _getcwd
-#define open    _open
-#define read    _read
-#define write   _write
-#define lseek   _lseek
-#define close   _close
-#define popen   _popen
-#define pclose  _pclose
-#define R_OK    04           /* read-only (for access()) */
-#define S_ISDIR(m)  (((m) & _S_IFMT) == _S_IFDIR)
-#ifndef __MINGW32__
-enum { STDIN_FILENO = 0, STDOUT_FILENO = 1, STDERR_FILENO = 2 };
-#endif
-#define S_IRUSR S_IREAD
-#define S_IWUSR S_IWRITE
-
-/* Not quite as lightweight as a hard-link, but more than good enough for us. */
-#define link(oldpath, newpath)  CopyFileA(oldpath, newpath, false)
-
-#define strcasecmp   _stricmp
-#define strncasecmp  _strnicmp
-
-/* In windows-land, hash<> is called hash_compare<> (from xhash.h) */
-#if _MSC_VER < 1700
-#define hash  hash_compare
-#endif
-
-/* Sleep is in ms, on windows */
-#define sleep(secs)  Sleep((secs) * 1000)
-
-/* We can't just use _vsnprintf and _snprintf as drop-in-replacements,
- * because they don't always NUL-terminate. :-(  We also can't use the
- * name vsnprintf, since windows defines that (but not snprintf (!)).
- */
-extern int snprintf(char *str, size_t size,
-                                       const char *format, ...);
-extern int safe_vsnprintf(char *str, size_t size,
-                          const char *format, va_list ap);
-#define vsnprintf(str, size, format, ap)  safe_vsnprintf(str, size, format, ap)
-#define va_copy(dst, src)  (dst) = (src)
-
-/* Windows doesn't support specifying the number of buckets as a
- * hash_map constructor arg, so we leave this blank.
- */
-#define CTEMPLATE_SMALL_HASHTABLE
-
-#define DEFAULT_TEMPLATE_ROOTDIR  ".."
-
-// ----------------------------------- SYSTEM/PROCESS
-typedef int pid_t;
-#define getpid  _getpid
-
-// ----------------------------------- THREADS
-typedef DWORD pthread_t;
-typedef DWORD pthread_key_t;
-typedef LONG pthread_once_t;
-enum { PTHREAD_ONCE_INIT = 0 };   // important that this be 0! for SpinLock
-#define pthread_self  GetCurrentThreadId
-#define pthread_equal(pthread_t_1, pthread_t_2)  ((pthread_t_1)==(pthread_t_2))
-
-#if defined(__MINGW32__)
-inline int localtime_s(tm * _tm, const time_t * time)
-{
-  tm * posix_local_time_struct = localtime(time);
-  if (posix_local_time_struct == NULL) 
-  {
-    return 1;
-  }
-
-  *_tm = *posix_local_time_struct;
-
-  return 0;
-}
-
-inline char* strerror_s(char* buf, size_t buflen, int errnum) 
-{
-  const char* str = strerror(errnum);
-  return strncpy(buf, str, buflen - 1);
-}
-#endif
-
-inline struct tm* localtime_r(const time_t* timep, struct tm* result) {
-  localtime_s(result, timep);
-  return result;
-}
-
-inline char* strerror_r(int errnum, char* buf, size_t buflen) {
-  strerror_s(buf, buflen, errnum);
-  return buf;
-}
-
-#ifndef __cplusplus
-/* I don't see how to get inlining for C code in MSVC.  Ah well. */
-#define inline
-#endif
-
-#endif  /* _WIN32 */
-
-#endif  /* CTEMPLATE_WINDOWS_PORT_H_ */
--- a/Resources/Patches/log4cplus-patch.diff	Mon Jun 13 10:26:56 2016 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
---- log4cplus-1.0.4.1/src/factory.cxx   2010-05-28 11:06:51.000000000 +0200
-+++ factory.cxx    2012-10-02 11:43:31.808439489 +0200
-@@ -35,7 +35,7 @@
- #  if defined (LOG4CPLUS_HAVE_WIN32_CONSOLE)
- #    include <log4cplus/win32consoleappender.h>
- #  endif
--#  include <log4cplus/Win32DebugAppender.h>
-+#  include <log4cplus/win32debugappender.h>
- #endif
-