diff options
| -rw-r--r-- | ACEXML/common/Transcode.h | 2 | ||||
| -rw-r--r-- | ChangeLog | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/ACEXML/common/Transcode.h b/ACEXML/common/Transcode.h index 0afaaa0e74c..72ebf7dd58e 100644 --- a/ACEXML/common/Transcode.h +++ b/ACEXML/common/Transcode.h @@ -47,7 +47,7 @@ public: ACEXML_INVALID_ARGS = -3, ACEXML_IS_SURROGATE = -4, ACEXML_NON_UNICODE = -5 - } STATUS; + } ACEXML_STATUS; // The following functions translate a unicode characters diff --git a/ChangeLog b/ChangeLog index cc7ce42af4d..d0a3b6f3a1b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Mon Oct 25 09:05:02 2004 Steve Totten <totten_s@ociweb.com> + + * ACEXML/common/Transcode.h: + Renamed STATUS to ACEXML_STATUS to avoid name clash on + platforms that define a macro STATUS (e.g., Tru64 cxx 6.1). + Sun Oct 24 08:39:12 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl> * tests/run_test.lst: |