From 215c1294d356e35b7717b05892a45b9f0b76a847 Mon Sep 17 00:00:00 2001
From: wei <>
Date: Fri, 1 Sep 2006 01:57:44 +0000
Subject: resolve adodb defined clashes

---
 framework/Util/TDateTimeStamp.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'framework')

diff --git a/framework/Util/TDateTimeStamp.php b/framework/Util/TDateTimeStamp.php
index 6a5bd9e6..9949b837 100644
--- a/framework/Util/TDateTimeStamp.php
+++ b/framework/Util/TDateTimeStamp.php
@@ -28,7 +28,8 @@
 	 http://lists.debian.org/debian-glibc/2002/debian-glibc-200205/msg00010.html
 */
 
-if (!defined('ADODB_ALLOW_NEGATIVE_TS')) define('ADODB_NO_NEGATIVE_TS',1);
+if (!defined('ADODB_ALLOW_NEGATIVE_TS') 
+	&& !defined('ADODB_NO_NEGATIVE_TS')) define('ADODB_NO_NEGATIVE_TS',1);
 
 /**
  * TDateTimeStamp Class
-- 
cgit v1.2.3