You are viewing a plain text version of this content. The canonical link for it is here.
Posted to log4cxx-dev@logging.apache.org by ca...@apache.org on 2005/03/04 05:23:20 UTC
cvs commit: logging-log4cxx/src cacheddateformat.cpp filewatchdog.cpp relativetimedateformat.cpp socketappenderskeleton.cpp stringhelper.cpp timezone.cpp
carnold 2005/03/03 20:23:20
Modified: src cacheddateformat.cpp filewatchdog.cpp
relativetimedateformat.cpp
socketappenderskeleton.cpp stringhelper.cpp
timezone.cpp
Log:
Different fix for APR's INT64_C problem
Revision Changes Path
1.15 +4 -2 logging-log4cxx/src/cacheddateformat.cpp
Index: cacheddateformat.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/src/cacheddateformat.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- cacheddateformat.cpp 1 Mar 2005 23:30:44 -0000 1.14
+++ cacheddateformat.cpp 4 Mar 2005 04:23:19 -0000 1.15
@@ -13,10 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
+#define __STDC_CONSTANT_MACROS
#include <log4cxx/helpers/cacheddateformat.h>
-#define INT64_C(x) x##LL
#include <apr_time.h>
#include <log4cxx/helpers/pool.h>
@@ -27,6 +26,9 @@
using namespace log4cxx::helpers;
using namespace log4cxx::pattern;
+
+
+
/**
* Supported digit set. If the wrapped DateFormat uses
* a different unit set, the millisecond pattern
1.15 +1 -5 logging-log4cxx/src/filewatchdog.cpp
Index: filewatchdog.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/src/filewatchdog.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- filewatchdog.cpp 15 Feb 2005 23:56:01 -0000 1.14
+++ filewatchdog.cpp 4 Mar 2005 04:23:19 -0000 1.15
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
+#define __STDC_CONSTANT_MACROS
#include <log4cxx/helpers/filewatchdog.h>
#include <log4cxx/helpers/loglog.h>
#include <sys/stat.h>
@@ -23,10 +23,6 @@
#include <apr_atomic.h>
#include <log4cxx/helpers/transcoder.h>
-//Define INT64_C for compilers that don't have it
-#if (!defined(INT64_C))
-#define INT64_C(value) int64_t(value)
-#endif
using namespace log4cxx;
1.11 +1 -5 logging-log4cxx/src/relativetimedateformat.cpp
Index: relativetimedateformat.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/src/relativetimedateformat.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- relativetimedateformat.cpp 15 Feb 2005 23:56:01 -0000 1.10
+++ relativetimedateformat.cpp 4 Mar 2005 04:23:19 -0000 1.11
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
+#define __STDC_CONSTANT_MACROS
#include <apr.h>
#include <log4cxx/helpers/relativetimedateformat.h>
@@ -24,10 +24,6 @@
#include <log4cxx/helpers/stringhelper.h>
-#if !defined(INT64_C)
-#define INT64_C(x) x ## LL
-#endif
-
log4cxx::helpers::RelativeTimeDateFormat::RelativeTimeDateFormat()
: DateFormat(), startTime(log4cxx::spi::LoggingEvent::getStartTime())
{
1.7 +1 -5 logging-log4cxx/src/socketappenderskeleton.cpp
Index: socketappenderskeleton.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/src/socketappenderskeleton.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- socketappenderskeleton.cpp 15 Feb 2005 23:56:01 -0000 1.6
+++ socketappenderskeleton.cpp 4 Mar 2005 04:23:19 -0000 1.7
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+#define __STDC_CONSTANT_MACROS
#include <log4cxx/net/socketappenderskeleton.h>
#include <log4cxx/helpers/loglog.h>
#include <log4cxx/helpers/socketoutputstream.h>
@@ -26,11 +27,6 @@
#include <apr_thread_proc.h>
#include <log4cxx/helpers/transcoder.h>
-//Define INT64_C for compilers that don't have it
-#if (!defined(INT64_C))
-#define INT64_C(value) int64_t(value)
-#endif
-
using namespace log4cxx;
using namespace log4cxx::helpers;
1.16 +1 -3 logging-log4cxx/src/stringhelper.cpp
Index: stringhelper.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/src/stringhelper.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- stringhelper.cpp 1 Mar 2005 23:30:44 -0000 1.15
+++ stringhelper.cpp 4 Mar 2005 04:23:19 -0000 1.16
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+#define __STDC_CONSTANT_MACROS
#include <log4cxx/helpers/stringhelper.h>
#include <log4cxx/helpers/transcoder.h>
#include <algorithm>
@@ -22,9 +23,6 @@
#include <apr_strings.h>
#include <log4cxx/helpers/pool.h>
-#if !defined(INT64_C)
-#define INT64_C(x) x##LL
-#endif
using namespace log4cxx;
using namespace log4cxx::helpers;
1.15 +1 -1 logging-log4cxx/src/timezone.cpp
Index: timezone.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/src/timezone.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- timezone.cpp 1 Mar 2005 23:30:44 -0000 1.14
+++ timezone.cpp 4 Mar 2005 04:23:19 -0000 1.15
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
+#define __STDC_CONSTANT_MACROS
#include <log4cxx/helpers/timezone.h>
#include <stdlib.h>