Author: tschoening Date: Thu Oct 8 18:03:06 2015 New Revision: 1707594 URL: http://svn.apache.org/viewvc?rev=1707594&view=rev Log: APR may include stdint.h already, which itself may provide INT64_C. So I swapped both lines to remove a warnign about a wrong redefinition of INT64_C in that case.
Modified: incubator/log4cxx/trunk/src/main/cpp/date.cpp Modified: incubator/log4cxx/trunk/src/main/cpp/date.cpp URL: http://svn.apache.org/viewvc/incubator/log4cxx/trunk/src/main/cpp/date.cpp?rev=1707594&r1=1707593&r2=1707594&view=diff ============================================================================== --- incubator/log4cxx/trunk/src/main/cpp/date.cpp (original) +++ incubator/log4cxx/trunk/src/main/cpp/date.cpp Thu Oct 8 18:03:06 2015 @@ -17,19 +17,16 @@ #include <log4cxx/logstring.h> #include <log4cxx/helpers/date.h> - +#include <apr_time.h> #ifndef INT64_C #define INT64_C(x) x ## LL #endif - -#include <apr_time.h> using namespace log4cxx; using namespace log4cxx::helpers; IMPLEMENT_LOG4CXX_OBJECT(Date) - Date::Date() : time(apr_time_now()) { }