You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by jb...@locus.apache.org on 2000/12/28 19:59:06 UTC
cvs commit: xml-xerces/c/src/util/Transcoders/MacOSUnicodeConverter MacOSUnicodeConverter.cpp MacOSUnicodeConverter.hpp
jberry 00/12/28 10:59:06
Modified: c/src/util/Transcoders/MacOSUnicodeConverter
MacOSUnicodeConverter.cpp MacOSUnicodeConverter.hpp
Log:
- Replace include of Carbon.h with specific include files.
Revision Changes Path
1.5 +13 -4 xml-xerces/c/src/util/Transcoders/MacOSUnicodeConverter/MacOSUnicodeConverter.cpp
Index: MacOSUnicodeConverter.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/util/Transcoders/MacOSUnicodeConverter/MacOSUnicodeConverter.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- MacOSUnicodeConverter.cpp 2000/10/09 19:02:16 1.4
+++ MacOSUnicodeConverter.cpp 2000/12/28 18:59:05 1.5
@@ -55,7 +55,7 @@
*/
/*
- * $Id: MacOSUnicodeConverter.cpp,v 1.4 2000/10/09 19:02:16 jberry Exp $
+ * $Id: MacOSUnicodeConverter.cpp,v 1.5 2000/12/28 18:59:05 jberry Exp $
*/
@@ -81,10 +81,19 @@
#include <cstddef>
#include <cstring>
-#if TARGET_API_MAC_CARBON
- #include <Carbon.h>
+#if defined(XML_MACOSX)
+ // Framework includes from ProjectBuilder
+ #include <CarbonCore/MacErrors.h>
+ #include <CarbonCore/Script.h>
+ #include <CarbonCore/TextUtils.h>
+ #include <CarbonCore/TextEncodingConverter.h>
+ #include <CarbonCore/TextCommon.h>
+ #include <CarbonCore/CodeFragments.h>
+ #include <CarbonCore/UnicodeConverter.h>
+ #include <CarbonCore/UnicodeUtilities.h>
#else
- #include <Errors.h>
+ // Classic includes otherwise
+ #include <MacErrors.h>
#include <Script.h>
#include <TextUtils.h>
#include <TextEncodingConverter.h>
1.4 +5 -3 xml-xerces/c/src/util/Transcoders/MacOSUnicodeConverter/MacOSUnicodeConverter.hpp
Index: MacOSUnicodeConverter.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/util/Transcoders/MacOSUnicodeConverter/MacOSUnicodeConverter.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MacOSUnicodeConverter.hpp 2000/10/09 19:02:17 1.3
+++ MacOSUnicodeConverter.hpp 2000/12/28 18:59:06 1.4
@@ -55,7 +55,7 @@
*/
/*
- * $Id: MacOSUnicodeConverter.hpp,v 1.3 2000/10/09 19:02:17 jberry Exp $
+ * $Id: MacOSUnicodeConverter.hpp,v 1.4 2000/12/28 18:59:06 jberry Exp $
*/
#ifndef MACOSUNICODECONVERTER_HPP
@@ -64,9 +64,11 @@
#include <util/TransService.hpp>
#include <cstddef>
-#if TARGET_API_MAC_CARBON
- #include <Carbon.h>
+#if defined(XML_MACOSX)
+ // Framework includes from ProjectBuilder
+ #include <CarbonCore/UnicodeConverter.h>
#else
+ // Classic includes otherwise
#include <UnicodeConverter.h>
#endif