Menu
▾
▴
[ZooLib-checkins] SF.net SVN: zoolib:[2704] trunk/zoolib/source/cxx
|
From: <ag...@us...> - 2012-02-01 00:10:32
|
Revision: 2704
http://zoolib.svn.sourceforge.net/zoolib/?rev=2704&view=rev
Author: agreen
Date: 2012-02-01 00:10:19 +0000 (Wed, 01 Feb 2012)
Log Message:
-----------
Switch away from the #\t approach.
Modified Paths:
--------------
trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_BBDevMgr.h
trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_Client.cpp
trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_OSXUSB.cpp
trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_OSXUSB.h
trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Source_DatonSet.cpp
trunk/zoolib/source/cxx/more/zoolib/fileformat/ZFileFormat_IFF.cpp
trunk/zoolib/source/cxx/more/zoolib/fileformat/ZFileFormat_QuickTime.cpp
trunk/zoolib/source/cxx/more/zoolib/netscape/ZCompat_npapi.h
trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_API.h
trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_GuestEntry.cpp
trunk/zoolib/source/cxx/more/zoolib/photoshop/ZPhotoshop_FileRef.cpp
trunk/zoolib/source/cxx/more/zoolib/photoshop/ZPhotoshop_Val.cpp
trunk/zoolib/source/cxx/old/zoolib/ZDCInk.cpp
trunk/zoolib/source/cxx/old/zoolib/ZDCPixmap_Asset_BMP.cpp
trunk/zoolib/source/cxx/old/zoolib/ZDCPoly.cpp
trunk/zoolib/source/cxx/old/zoolib/ZDC_GDI.h
trunk/zoolib/source/cxx/old/zoolib/ZDC_QD.cpp
trunk/zoolib/source/cxx/old/zoolib/ZDC_QD.h
trunk/zoolib/source/cxx/old/zoolib/ZDC_X.h
trunk/zoolib/source/cxx/old/zoolib/ZNodeRep_Overlay.h
trunk/zoolib/source/cxx/old/zoolib/ZUtil_Asset.cpp
trunk/zoolib/source/cxx/old/zoolib/ZUtil_Graphics.cpp
trunk/zoolib/source/cxx/old/zoolib/ZUtil_Mac_HL.cpp
trunk/zoolib/source/cxx/old/zoolib/ZUtil_Mac_LL.cpp
trunk/zoolib/source/cxx/old/zoolib/ZVal_ZooLib.cpp
trunk/zoolib/source/cxx/old/zoolib/ZVal_ZooLib.h
trunk/zoolib/source/cxx/old/zoolib/ZYad_ZooLibStrim.cpp
trunk/zoolib/source/cxx/zoolib/ZAtomic.cpp
trunk/zoolib/source/cxx/zoolib/ZAtomic.h
trunk/zoolib/source/cxx/zoolib/ZBlockStore_PhaseTree.cpp
trunk/zoolib/source/cxx/zoolib/ZBlockStore_PhaseTree.h
trunk/zoolib/source/cxx/zoolib/ZByteSwap.cpp
trunk/zoolib/source/cxx/zoolib/ZByteSwap.h
trunk/zoolib/source/cxx/zoolib/ZCONFIG_SPI.h
trunk/zoolib/source/cxx/zoolib/ZCaller_CFRunLoop.h
trunk/zoolib/source/cxx/zoolib/ZCompare_T.h
trunk/zoolib/source/cxx/zoolib/ZCompat_Win.h
trunk/zoolib/source/cxx/zoolib/ZCompat_Xlib.h
trunk/zoolib/source/cxx/zoolib/ZCompat_algorithm.h
trunk/zoolib/source/cxx/zoolib/ZCompat_string.h
trunk/zoolib/source/cxx/zoolib/ZDCFont.cpp
trunk/zoolib/source/cxx/zoolib/ZDCFont.h
trunk/zoolib/source/cxx/zoolib/ZDCPixmapBlit.cpp
trunk/zoolib/source/cxx/zoolib/ZDCPixmapCoder_BMP.cpp
trunk/zoolib/source/cxx/zoolib/ZDebug.cpp
trunk/zoolib/source/cxx/zoolib/ZDebug.h
trunk/zoolib/source/cxx/zoolib/ZFile_POSIX.cpp
trunk/zoolib/source/cxx/zoolib/ZFile_POSIX.h
trunk/zoolib/source/cxx/zoolib/ZFile_Win.h
trunk/zoolib/source/cxx/zoolib/ZGRgnRep_HRGN.h
trunk/zoolib/source/cxx/zoolib/ZGRgnRep_RgnHandle.h
trunk/zoolib/source/cxx/zoolib/ZGRgnRep_XRegion.h
trunk/zoolib/source/cxx/zoolib/ZGeom.h
trunk/zoolib/source/cxx/zoolib/ZMACRO_typeof.h
trunk/zoolib/source/cxx/zoolib/ZMacCFM.h
trunk/zoolib/source/cxx/zoolib/ZMacOSX.cpp
trunk/zoolib/source/cxx/zoolib/ZMain.cpp
trunk/zoolib/source/cxx/zoolib/ZNetDNSSD.h
trunk/zoolib/source/cxx/zoolib/ZNet_Internet_MacOT_OSX.cpp
trunk/zoolib/source/cxx/zoolib/ZNet_Internet_MacOT_OSX.h
trunk/zoolib/source/cxx/zoolib/ZNet_Internet_Socket.h
trunk/zoolib/source/cxx/zoolib/ZNet_Internet_WinSock.h
trunk/zoolib/source/cxx/zoolib/ZNet_Local_Socket.h
trunk/zoolib/source/cxx/zoolib/ZNet_Local_Win.h
trunk/zoolib/source/cxx/zoolib/ZNet_RFCOMM_OSX.h
trunk/zoolib/source/cxx/zoolib/ZNet_Socket.cpp
trunk/zoolib/source/cxx/zoolib/ZNet_Socket.h
trunk/zoolib/source/cxx/zoolib/ZRGBA.h
trunk/zoolib/source/cxx/zoolib/ZRef.h
trunk/zoolib/source/cxx/zoolib/ZStackCrawl.h
trunk/zoolib/source/cxx/zoolib/ZStream.cpp
trunk/zoolib/source/cxx/zoolib/ZStream_MD5.h
trunk/zoolib/source/cxx/zoolib/ZStream_POSIX.cpp
trunk/zoolib/source/cxx/zoolib/ZStream_SHA1.cpp
trunk/zoolib/source/cxx/zoolib/ZStream_SHA1.h
trunk/zoolib/source/cxx/zoolib/ZStream_ZLib.h
trunk/zoolib/source/cxx/zoolib/ZStream_bzip2.h
trunk/zoolib/source/cxx/zoolib/ZString.cpp
trunk/zoolib/source/cxx/zoolib/ZTextCoder_ICU.h
trunk/zoolib/source/cxx/zoolib/ZTextCoder_Mac.h
trunk/zoolib/source/cxx/zoolib/ZTextCoder_Win.h
trunk/zoolib/source/cxx/zoolib/ZTextCoder_iconv.h
trunk/zoolib/source/cxx/zoolib/ZTextCollator_ICU.cpp
trunk/zoolib/source/cxx/zoolib/ZTextCollator_ICU.h
trunk/zoolib/source/cxx/zoolib/ZThread_MacMP.h
trunk/zoolib/source/cxx/zoolib/ZThread_Win.h
trunk/zoolib/source/cxx/zoolib/ZThread_boost.h
trunk/zoolib/source/cxx/zoolib/ZThread_pthread.h
trunk/zoolib/source/cxx/zoolib/ZTime.cpp
trunk/zoolib/source/cxx/zoolib/ZUSB_OSX.h
trunk/zoolib/source/cxx/zoolib/ZUnicode.cpp
trunk/zoolib/source/cxx/zoolib/ZUtil_ATSUI.h
trunk/zoolib/source/cxx/zoolib/ZUtil_AppleEvent.h
trunk/zoolib/source/cxx/zoolib/ZUtil_Debug.cpp
trunk/zoolib/source/cxx/zoolib/ZUtil_POSIXFD.cpp
trunk/zoolib/source/cxx/zoolib/ZUtil_Time.cpp
trunk/zoolib/source/cxx/zoolib/ZUtil_string.cpp
trunk/zoolib/source/cxx/zoolib/ZVal_AppleEvent.cpp
trunk/zoolib/source/cxx/zoolib/ZVal_Yad.cpp
trunk/zoolib/source/cxx/zoolib/ZYadSeq_ApplyID.cpp
trunk/zoolib/source/cxx/zoolib/ZYadSeq_ApplyID.h
trunk/zoolib/source/cxx/zoolib/zconfigl.h
Modified: trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_BBDevMgr.h
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_BBDevMgr.h 2012-02-01 00:07:03 UTC (rev 2703)
+++ trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_BBDevMgr.h 2012-02-01 00:10:19 UTC (rev 2704)
@@ -25,11 +25,11 @@
#include "zoolib/ZCONFIG_SPI.h"
#ifndef ZCONFIG_API_Avail__BlackBerry_BBDevMgr
-# define ZCONFIG_API_Avail__BlackBerry_BBDevMgr ZCONFIG_SPI_Enabled(Win)
+ #define ZCONFIG_API_Avail__BlackBerry_BBDevMgr ZCONFIG_SPI_Enabled(Win)
#endif
#ifndef ZCONFIG_API_Desired__BlackBerry_BBDevMgr
-# define ZCONFIG_API_Desired__BlackBerry_BBDevMgr 1
+ #define ZCONFIG_API_Desired__BlackBerry_BBDevMgr 1
#endif
#include "zoolib/blackberry/ZBlackBerry.h"
Modified: trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_Client.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_Client.cpp 2012-02-01 00:07:03 UTC (rev 2703)
+++ trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_Client.cpp 2012-02-01 00:10:19 UTC (rev 2704)
@@ -275,7 +275,7 @@
ZAssert(!req);
fOpen = false;
-//## ZStreamerWriter::Wake();
+//# #ZStreamerWriter::Wake();
return false;
}
@@ -306,7 +306,7 @@
void Device_Client::Stop()
{
fOpen = false;
-//## ZStreamerWriter::Wake();
+//# #ZStreamerWriter::Wake();
}
// =================================================================================================
@@ -347,7 +347,7 @@
fSendClose = true;
this->WakeWrite();
-//## ZCommer::ReadFinished();
+//# #ZCommer::ReadFinished();
}
bool Manager_Client::Commer_Changed::Read(const ZStreamR& r)
Modified: trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_OSXUSB.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_OSXUSB.cpp 2012-02-01 00:07:03 UTC (rev 2703)
+++ trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_OSXUSB.cpp 2012-02-01 00:10:19 UTC (rev 2704)
@@ -367,8 +367,8 @@
// Watcher fired, but could not create a USBDevice.
if (ZLOG(s, eNotice, "ZBlackBerry::Manager_OSXUSB"))
s << "Added, invoked with null device, PocketMac drivers installed?";
-//## if (fPocketMacDriverInstalled)
-//## fObserver->AddFailed();
+//# #if (fPocketMacDriverInstalled)
+//# #fObserver->AddFailed();
return;
}
Modified: trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_OSXUSB.h
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_OSXUSB.h 2012-02-01 00:07:03 UTC (rev 2703)
+++ trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_OSXUSB.h 2012-02-01 00:10:19 UTC (rev 2704)
@@ -27,17 +27,17 @@
#include "zoolib/ZUSB_OSX.h"
#ifndef ZCONFIG_API_Avail__BlackBerry_OSXUSB
-# if ZCONFIG_API_Enabled(USB_OSX)
-# define ZCONFIG_API_Avail__BlackBerry_OSXUSB 1
-# endif
+ #if ZCONFIG_API_Enabled(USB_OSX)
+ #define ZCONFIG_API_Avail__BlackBerry_OSXUSB 1
+ #endif
#endif
#ifndef ZCONFIG_API_Avail__BlackBerry_OSXUSB
-# define ZCONFIG_API_Avail__BlackBerry_OSXUSB 0
+ #define ZCONFIG_API_Avail__BlackBerry_OSXUSB 0
#endif
#ifndef ZCONFIG_API_Desired__BlackBerry_OSXUSB
-# define ZCONFIG_API_Desired__BlackBerry_OSXUSB 1
+ #define ZCONFIG_API_Desired__BlackBerry_OSXUSB 1
#endif
#include "zoolib/blackberry/ZBlackBerry.h"
Modified: trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Source_DatonSet.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Source_DatonSet.cpp 2012-02-01 00:07:03 UTC (rev 2703)
+++ trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Source_DatonSet.cpp 2012-02-01 00:10:19 UTC (rev 2704)
@@ -278,7 +278,7 @@
s << "\nDatonSet Raw:\n" << iAdded->GetRel();
ZRef<ZRA::Expr_Rel> theRel = iAdded->GetRel();
-//## theRel = ZQE::sTransform_Search(theRel);
+//# #theRel = ZQE::sTransform_Search(theRel);
if (ZLOGPF(s, eDebug + 1))
s << "\nDatonSet Cooked:\n" << theRel;
Modified: trunk/zoolib/source/cxx/more/zoolib/fileformat/ZFileFormat_IFF.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/fileformat/ZFileFormat_IFF.cpp 2012-02-01 00:07:03 UTC (rev 2703)
+++ trunk/zoolib/source/cxx/more/zoolib/fileformat/ZFileFormat_IFF.cpp 2012-02-01 00:10:19 UTC (rev 2704)
@@ -25,7 +25,7 @@
#include <string.h> // For strlen
#ifndef kDebug_IFF
-# define kDebug_IFF 1
+ #define kDebug_IFF 1
#endif
namespace ZooLib {
Modified: trunk/zoolib/source/cxx/more/zoolib/fileformat/ZFileFormat_QuickTime.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/fileformat/ZFileFormat_QuickTime.cpp 2012-02-01 00:07:03 UTC (rev 2703)
+++ trunk/zoolib/source/cxx/more/zoolib/fileformat/ZFileFormat_QuickTime.cpp 2012-02-01 00:10:19 UTC (rev 2704)
@@ -25,7 +25,7 @@
#include <string.h> // For strlen
#ifndef kDebug_QTFile
-# define kDebug_QTFile 1
+ #define kDebug_QTFile 1
#endif
namespace ZooLib {
Modified: trunk/zoolib/source/cxx/more/zoolib/netscape/ZCompat_npapi.h
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/netscape/ZCompat_npapi.h 2012-02-01 00:07:03 UTC (rev 2703)
+++ trunk/zoolib/source/cxx/more/zoolib/netscape/ZCompat_npapi.h 2012-02-01 00:10:19 UTC (rev 2704)
@@ -40,7 +40,7 @@
#endif
#ifndef ZCONFIG_NPStringUpperCaseFieldNames
- # define ZCONFIG_NPStringUpperCaseFieldNames 1
+ #define ZCONFIG_NPStringUpperCaseFieldNames 1
#endif
#define NPEventType_GetFocusEvent getFocusEvent
@@ -54,26 +54,26 @@
#endif
#if defined(_NPFUNCTIONS_H_)
-# define ZCONFIG_NPAPI_WebKit_10_4 1
+ #define ZCONFIG_NPAPI_WebKit_10_4 1
#elif defined(NPFUNCTIONS_H)
-# if defined(EXPORTED_CALLBACK)
-# define ZCONFIG_NPAPI_WebKit_Recent 1
-# else
-# define ZCONFIG_NPAPI_WebKit_10_5 1
-# endif
+ #if defined(EXPORTED_CALLBACK)
+ #define ZCONFIG_NPAPI_WebKit_Recent 1
+ #else
+ #define ZCONFIG_NPAPI_WebKit_10_5 1
+ #endif
#elif defined(_NPUPP_H_)
-# if defined(_NPUPP_USE_UPP_)
-# define ZCONFIG_NPAPI_Mozilla_Old 1
-# else
-# define ZCONFIG_NPAPI_Mozilla_New 1
-# endif
+ #if defined(_NPUPP_USE_UPP_)
+ #define ZCONFIG_NPAPI_Mozilla_Old 1
+ #else
+ #define ZCONFIG_NPAPI_Mozilla_New 1
+ #endif
#endif
// =================================================================================================
// Fixup the NPString field name change
#ifndef ZCONFIG_NPStringUpperCaseFieldNames
-# define ZCONFIG_NPStringUpperCaseFieldNames 0
+ #define ZCONFIG_NPStringUpperCaseFieldNames 0
#endif
#if ZCONFIG_NPStringUpperCaseFieldNames
Modified: trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_API.h
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_API.h 2012-02-01 00:07:03 UTC (rev 2703)
+++ trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_API.h 2012-02-01 00:10:19 UTC (rev 2704)
@@ -58,19 +58,19 @@
#if ZCONFIG_SPI_Enabled(Win)
-# define XP_WIN 1
+ #define XP_WIN 1
#elif ZCONFIG_SPI_Enabled(Carbon64)
-# if __MACH__
-# define XP_MACOSX 1
-# else
-# define XP_MAC 1
-# endif
+ #if __MACH__
+ #define XP_MACOSX 1
+ #else
+ #define XP_MAC 1
+ #endif
#elif ZCONFIG_SPI_Enabled(X11)
-# define XP_UNIX 1
+ #define XP_UNIX 1
#endif
@@ -78,34 +78,34 @@
// MARK: - NP_NO_QUICKDRAW and NP_NO_CARBON
#if defined(XP_MACOSX) && __LP64__
-# define NP_NO_QUICKDRAW 1
-# define NP_NO_CARBON 1
+ #define NP_NO_QUICKDRAW 1
+ #define NP_NO_CARBON 1
#endif
// =================================================================================================
// MARK: - Mac headers
#if defined(XP_MACOSX)
-# include <ApplicationServices/ApplicationServices.h>
-# include <OpenGL/OpenGL.h>
+ #include <ApplicationServices/ApplicationServices.h>
+ #include <OpenGL/OpenGL.h>
#endif
#if defined(XP_MACOSX) || defined(XP_MAC)
-# include ZMACINCLUDE2(Carbon,Carbon.h)
+ #include ZMACINCLUDE2(Carbon,Carbon.h)
#endif
// =================================================================================================
// MARK: - Windows headers
#if defined(XP_WIN)
-# include "zoolib/ZCompat_Win.h"
+ #include "zoolib/ZCompat_Win.h"
#endif
// =================================================================================================
// MARK: - UNIX headers
#if defined(XP_UNIX)
-# include "zoolib/ZCompat_XLib.h"
+ #include "zoolib/ZCompat_XLib.h"
#endif
// =================================================================================================
@@ -119,9 +119,9 @@
#pragma mark "* Mac-specific, set structure alignment to be 68K"
#if ! __LP64__
-# if defined(XP_MAC) || defined(XP_MACOSX)
-# pragma options align=mac68k
-# endif
+ #if defined(XP_MAC) || defined(XP_MACOSX)
+ #pragma options align=mac68k
+ #endif
#endif
// =================================================================================================
@@ -903,15 +903,15 @@
// MARK: - Mac-specific, reset structure alignment
#if ! __LP64__
-# if defined(XP_MAC) || defined(XP_MACOSX)
-# pragma options align=reset
-# endif
+ #if defined(XP_MAC) || defined(XP_MACOSX)
+ #pragma options align=reset
+ #endif
#endif
#if defined(XP_WIN)
-# define ZNetscape_API_EXPORTED_CALLBACK(_type, _name) _type (__stdcall * _name)
+ #define ZNetscape_API_EXPORTED_CALLBACK(_type, _name) _type (__stdcall * _name)
#else
-# define ZNetscape_API_EXPORTED_CALLBACK(_type, _name) _type (* _name)
+ #define ZNetscape_API_EXPORTED_CALLBACK(_type, _name) _type (* _name)
#endif
Modified: trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_GuestEntry.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_GuestEntry.cpp 2012-02-01 00:07:03 UTC (rev 2703)
+++ trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_GuestEntry.cpp 2012-02-01 00:10:19 UTC (rev 2704)
@@ -32,11 +32,11 @@
// =================================================================================================
#if defined(XP_WIN)
-# define EXPORT_DECL(ret) extern "C" __declspec(dllexport) ret __stdcall
-# define EXPORT_DEF(ret) ret __stdcall
+ #define EXPORT_DECL(ret) extern "C" __declspec(dllexport) ret __stdcall
+ #define EXPORT_DEF(ret) ret __stdcall
#else
-# define EXPORT_DECL(ret) extern "C" __attribute__((visibility("default"))) ret
-# define EXPORT_DEF(ret) ret
+ #define EXPORT_DECL(ret) extern "C" __attribute__((visibility("default"))) ret
+ #define EXPORT_DEF(ret) ret
#endif
#if !ZCONFIG(Processor, PPC) || !__MACH__
Modified: trunk/zoolib/source/cxx/more/zoolib/photoshop/ZPhotoshop_FileRef.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/photoshop/ZPhotoshop_FileRef.cpp 2012-02-01 00:07:03 UTC (rev 2703)
+++ trunk/zoolib/source/cxx/more/zoolib/photoshop/ZPhotoshop_FileRef.cpp 2012-02-01 00:10:19 UTC (rev 2704)
@@ -461,7 +461,7 @@
#elif defined(__PIWin__)
// Need to look at this again when we're doing 64 bit compiles.
-//## ZAssertCompile(ZIntTrait_T<sizeof(size_t)>::eIs32Bit);
+//# #ZAssertCompile(ZIntTrait_T<sizeof(size_t)>::eIs32Bit);
UseHandle useHandle(fHandle);
size_t handleSize = useHandle.Size();
Modified: trunk/zoolib/source/cxx/more/zoolib/photoshop/ZPhotoshop_Val.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/photoshop/ZPhotoshop_Val.cpp 2012-02-01 00:07:03 UTC (rev 2703)
+++ trunk/zoolib/source/cxx/more/zoolib/photoshop/ZPhotoshop_Val.cpp 2012-02-01 00:10:19 UTC (rev 2704)
@@ -28,11 +28,11 @@
#include "PIUSuites.h"
#if ZCONFIG_SPI_Enabled(Carbon64)
-# if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_4
-# include ZMACINCLUDE3(ApplicationServices,AE,AEObjects.h)
-# else
-# include ZMACINCLUDE3(CoreServices,AE,AEObjects.h)
-# endif
+ #if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_4
+ #include ZMACINCLUDE3(ApplicationServices,AE,AEObjects.h)
+ #else
+ #include ZMACINCLUDE3(CoreServices,AE,AEObjects.h)
+ #endif
#endif
#if ZCONFIG_SPI_Enabled(Win)
@@ -364,7 +364,7 @@
TypeID theType;
if (noErr != spPSActionList->GetType(iSource, x, &theType))
break;
-//## COPYFROMTO(spPSActionList, iSource, x, theType, theDest)
+//# #COPYFROMTO(spPSActionList, iSource, x, theType, theDest)
}
}
return theDest;
Modified: trunk/zoolib/source/cxx/old/zoolib/ZDCInk.cpp
===================================================================
--- trunk/zoolib/source/cxx/old/zoolib/ZDCInk.cpp 2012-02-01 00:07:03 UTC (rev 2703)
+++ trunk/zoolib/source/cxx/old/zoolib/ZDCInk.cpp 2012-02-01 00:10:19 UTC (rev 2704)
@@ -54,20 +54,20 @@
#if ZCONFIG(Compiler, CodeWarrior)
// Enforce higher level of optimization for this code -- otherwise
// the funky switch stuff is all for naught.
-# pragma push
-# pragma optimization_level 4
-# pragma opt_common_subs on
-# pragma opt_lifetimes on
-# pragma peephole on
-# if ZCONFIG(Processor, x86)
-# pragma register_coloring on
-# endif
+ #pragma push
+ #pragma optimization_level 4
+ #pragma opt_common_subs on
+ #pragma opt_lifetimes on
+ #pragma peephole on
+ #if ZCONFIG(Processor, x86)
+ #pragma register_coloring on
+ #endif
#endif
#if ZCONFIG(Compiler, CodeWarrior) && (ZCONFIG(Processor, 68K) || ZCONFIG(Processor, x86))
-# define RotateLeft(a,b,c) __rol(a,b)
+ #define RotateLeft(a,b,c) __rol(a,b)
#else
-# define RotateLeft(value, distance, eightMinusDistance) \
+ #define RotateLeft(value, distance, eightMinusDistance) \
(((value) << (distance)) | ((value) >> (eightMinusDistance)))
#endif
@@ -153,7 +153,7 @@
}
#if ZCONFIG(Compiler, CodeWarrior)
-# pragma pop
+ #pragma pop
#endif
// =================================================================================================
Modified: trunk/zoolib/source/cxx/old/zoolib/ZDCPixmap_Asset_BMP.cpp
===================================================================
--- trunk/zoolib/source/cxx/old/zoolib/ZDCPixmap_Asset_BMP.cpp 2012-02-01 00:07:03 UTC (rev 2703)
+++ trunk/zoolib/source/cxx/old/zoolib/ZDCPixmap_Asset_BMP.cpp 2012-02-01 00:10:19 UTC (rev 2704)
@@ -29,10 +29,10 @@
// From wingdi.h
#ifndef BI_RGB
-# define BI_RGB 0L
-# define BI_RLE8 1L
-# define BI_RLE4 2L
-# define BI_BITFIELDS 3L
+ #define BI_RGB 0L
+ #define BI_RLE8 1L
+ #define BI_RLE4 2L
+ #define BI_BITFIELDS 3L
#endif
// =================================================================================================
Modified: trunk/zoolib/source/cxx/old/zoolib/ZDCPoly.cpp
===================================================================
--- trunk/zoolib/source/cxx/old/zoolib/ZDCPoly.cpp 2012-02-01 00:07:03 UTC (rev 2703)
+++ trunk/zoolib/source/cxx/old/zoolib/ZDCPoly.cpp 2012-02-01 00:10:19 UTC (rev 2704)
@@ -75,7 +75,7 @@
#include "zoolib/ZMemory.h" // For ZMemCopy
#if ZCONFIG_SPI_Enabled(QuickDraw)
-# include ZMACINCLUDE3(CoreServices,CarbonCore,MacMemory.h) // For HLock etc.
+ #include ZMACINCLUDE3(CoreServices,CarbonCore,MacMemory.h) // For HLock etc.
#endif
using ZooLib::ZCoord;
Modified: trunk/zoolib/source/cxx/old/zoolib/ZDC_GDI.h
===================================================================
--- trunk/zoolib/source/cxx/old/zoolib/ZDC_GDI.h 2012-02-01 00:07:03 UTC (rev 2703)
+++ trunk/zoolib/source/cxx/old/zoolib/ZDC_GDI.h 2012-02-01 00:10:19 UTC (rev 2704)
@@ -25,11 +25,11 @@
#include "zoolib/ZCONFIG_SPI.h"
#ifndef ZCONFIG_API_Avail__DC_GDI
-# define ZCONFIG_API_Avail__DC_GDI ZCONFIG_SPI_Enabled(GDI)
+ #define ZCONFIG_API_Avail__DC_GDI ZCONFIG_SPI_Enabled(GDI)
#endif
#ifndef ZCONFIG_API_Desired__DC_GDI
-# define ZCONFIG_API_Desired__DC_GDI 1
+ #define ZCONFIG_API_Desired__DC_GDI 1
#endif
#include "zoolib/ZDC.h"
Modified: trunk/zoolib/source/cxx/old/zoolib/ZDC_QD.cpp
===================================================================
--- trunk/zoolib/source/cxx/old/zoolib/ZDC_QD.cpp 2012-02-01 00:07:03 UTC (rev 2703)
+++ trunk/zoolib/source/cxx/old/zoolib/ZDC_QD.cpp 2012-02-01 00:10:19 UTC (rev 2704)
@@ -38,14 +38,14 @@
// If we're using the old headers then MacLineTo won't be defined
#if !defined(TARGET_OS_MAC) || (TARGET_OS_MAC && !defined(MacLineTo))
-# define MacLineTo LineTo
-# define MacFrameRect FrameRect
-# define MacInvertRect InvertRect
-# define MacFrameRgn FrameRgn
-# define MacInvertRgn InvertRgn
-# define MacPaintRgn PaintRgn
-# define MacDrawText DrawText
-# define MacOffsetRgn OffsetRgn
+ #define MacLineTo LineTo
+ #define MacFrameRect FrameRect
+ #define MacInvertRect InvertRect
+ #define MacFrameRgn FrameRgn
+ #define MacInvertRgn InvertRgn
+ #define MacPaintRgn PaintRgn
+ #define MacDrawText DrawText
+ #define MacOffsetRgn OffsetRgn
#endif
#include ZMACINCLUDE3(CoreServices,CarbonCore,LowMem.h) // For LMSetHiliteMode
Modified: trunk/zoolib/source/cxx/old/zoolib/ZDC_QD.h
===================================================================
--- trunk/zoolib/source/cxx/old/zoolib/ZDC_QD.h 2012-02-01 00:07:03 UTC (rev 2703)
+++ trunk/zoolib/source/cxx/old/zoolib/ZDC_QD.h 2012-02-01 00:10:19 UTC (rev 2704)
@@ -25,11 +25,11 @@
#include "zoolib/ZCONFIG_SPI.h"
#ifndef ZCONFIG_API_Avail__DC_QD
-# define ZCONFIG_API_Avail__DC_QD ZCONFIG_SPI_Enabled(QuickDraw)
+ #define ZCONFIG_API_Avail__DC_QD ZCONFIG_SPI_Enabled(QuickDraw)
#endif
#ifndef ZCONFIG_API_Desired__DC_QD
-# define ZCONFIG_API_Desired__DC_QD 1
+ #define ZCONFIG_API_Desired__DC_QD 1
#endif
Modified: trunk/zoolib/source/cxx/old/zoolib/ZDC_X.h
===================================================================
--- trunk/zoolib/source/cxx/old/zoolib/ZDC_X.h 2012-02-01 00:07:03 UTC (rev 2703)
+++ trunk/zoolib/source/cxx/old/zoolib/ZDC_X.h 2012-02-01 00:10:19 UTC (rev 2704)
@@ -25,11 +25,11 @@
#include "zoolib/ZCONFIG_SPI.h"
#ifndef ZCONFIG_API_Avail__DC_X
-# define ZCONFIG_API_Avail__DC_X ZCONFIG_SPI_Enabled(X11)
+ #define ZCONFIG_API_Avail__DC_X ZCONFIG_SPI_Enabled(X11)
#endif
#ifndef ZCONFIG_API_Desired__DC_X
-# define ZCONFIG_API_Desired__DC_X 1
+ #define ZCONFIG_API_Desired__DC_X 1
#endif
#include "zoolib/ZDC.h"
Modified: trunk/zoolib/source/cxx/old/zoolib/ZNodeRep_Overlay.h
===================================================================
--- trunk/zoolib/source/cxx/old/zoolib/ZNodeRep_Overlay.h 2012-02-01 00:07:03 UTC (rev 2703)
+++ trunk/zoolib/source/cxx/old/zoolib/ZNodeRep_Overlay.h 2012-02-01 00:10:19 UTC (rev 2704)
@@ -52,7 +52,7 @@
virtual ZRef<ZNodeRep> CreateDir(Error* oError);
virtual ZRef<ZNodeRep> MoveTo(ZRef<ZNodeRep> iDest, Error* oError);
-//## virtual ZRef<ZNodeRep> MoveFrom(ZRef<ZNodeRep> iSource, Error* oError);
+//# #virtual ZRef<ZNodeRep> MoveFrom(ZRef<ZNodeRep> iSource, Error* oError);
virtual bool Delete(Error* oError);
virtual ZRef<ZStreamerR> OpenR(bool iPreventWriters, Error* oError);
Modified: trunk/zoolib/source/cxx/old/zoolib/ZUtil_Asset.cpp
===================================================================
--- trunk/zoolib/source/cxx/old/zoolib/ZUtil_Asset.cpp 2012-02-01 00:07:03 UTC (rev 2703)
+++ trunk/zoolib/source/cxx/old/zoolib/ZUtil_Asset.cpp 2012-02-01 00:10:19 UTC (rev 2704)
@@ -33,18 +33,18 @@
#include "zoolib/ZString.h" // For pascal string conversions
#if ZCONFIG_SPI_Enabled(POSIX)
-# include <sys/types.h> // For lseek
-# include <fcntl.h> // For open
-# include <unistd.h> // For lseek
+ #include <sys/types.h> // For lseek
+ #include <fcntl.h> // For open
+ #include <unistd.h> // For lseek
#endif
#if ZCONFIG_SPI_Enabled(Win)
-# include "zoolib/ZUnicode.h"
-# include "zoolib/ZUtil_Win.h"
+ #include "zoolib/ZUnicode.h"
+ #include "zoolib/ZUtil_Win.h"
#endif
#if ZCONFIG_SPI_Enabled(Carbon)
-# include ZMACINCLUDE3(CoreServices,CarbonCore,Resources.h)
+ #include ZMACINCLUDE3(CoreServices,CarbonCore,Resources.h)
#endif
namespace ZooLib {
Modified: trunk/zoolib/source/cxx/old/zoolib/ZUtil_Graphics.cpp
===================================================================
--- trunk/zoolib/source/cxx/old/zoolib/ZUtil_Graphics.cpp 2012-02-01 00:07:03 UTC (rev 2703)
+++ trunk/zoolib/source/cxx/old/zoolib/ZUtil_Graphics.cpp 2012-02-01 00:10:19 UTC (rev 2704)
@@ -28,8 +28,8 @@
#include "zoolib/ZDC_QD.h"
#if ZCONFIG_SPI_Enabled(MacClassic) || ZCONFIG_SPI_Enabled(Carbon)
-# include ZMACINCLUDE3(Carbon,HIToolbox,Drag.h) // For GetDragHiliteColor
-# include ZMACINCLUDE3(CoreServices,CarbonCore,LowMem.h) // For LMGetHiliteRGB
+ #include ZMACINCLUDE3(Carbon,HIToolbox,Drag.h) // For GetDragHiliteColor
+ #include ZMACINCLUDE3(CoreServices,CarbonCore,LowMem.h) // For LMGetHiliteRGB
#endif
using std::vector;
Modified: trunk/zoolib/source/cxx/old/zoolib/ZUtil_Mac_HL.cpp
===================================================================
--- trunk/zoolib/source/cxx/old/zoolib/ZUtil_Mac_HL.cpp 2012-02-01 00:07:03 UTC (rev 2703)
+++ trunk/zoolib/source/cxx/old/zoolib/ZUtil_Mac_HL.cpp 2012-02-01 00:10:19 UTC (rev 2704)
@@ -587,8 +587,8 @@
if (inColorPixmap)
sAddPixmapToIconFamily(inColorPixmap, eData8, theIconFamilyHandle);
-//## if (inColorPixmap)
-//## sAddPixmapToIconFamily(inColorPixmap, eData32, theIconFamilyHandle);
+//# #if (inColorPixmap)
+//# #sAddPixmapToIconFamily(inColorPixmap, eData32, theIconFamilyHandle);
if (inMonoPixmap)
sAddPixmapToIconFamily(inMonoPixmap, eData1, theIconFamilyHandle);
@@ -635,7 +635,7 @@
/* if (ZApp::sGet())
{
ZDCRgn theDCRgn;
-//## ZApp::sGet()->AppleEventIdleProc(theEventRecord, sleepTime, theDCRgn);
+//# #ZApp::sGet()->AppleEventIdleProc(theEventRecord, sleepTime, theDCRgn);
::MacCopyRgn(theDCRgn, *outMouseRgn);
}*/
return false;
@@ -671,8 +671,8 @@
static ModalFilterUPP sModalFilterUPP = NewModalFilterUPP(ZUtil_Mac_HL::sModalFilter);
pascal Boolean ZUtil_Mac_HL::sModalFilter(DialogPtr theDialog, EventRecord* inOutEventRecord, short* inOutItemHit)
{
-//## if (ZApp::sGet())
-//## return ZApp::sGet()->ModalFilter(theDialog, theEventRecord, itemHit);
+//# #if (ZApp::sGet())
+//# #return ZApp::sGet()->ModalFilter(theDialog, theEventRecord, itemHit);
return false;
}
Modified: trunk/zoolib/source/cxx/old/zoolib/ZUtil_Mac_LL.cpp
===================================================================
--- trunk/zoolib/source/cxx/old/zoolib/ZUtil_Mac_LL.cpp 2012-02-01 00:07:03 UTC (rev 2703)
+++ trunk/zoolib/source/cxx/old/zoolib/ZUtil_Mac_LL.cpp 2012-02-01 00:10:19 UTC (rev 2704)
@@ -30,7 +30,7 @@
#include <new> // for bad_alloc
#if ZCONFIG_SPI_Enabled(Carbon)
-# include ZMACINCLUDE3(CoreServices,CarbonCore,Resources.h)
+ #include ZMACINCLUDE3(CoreServices,CarbonCore,Resources.h)
#endif
using std::bad_alloc;
Modified: trunk/zoolib/source/cxx/old/zoolib/ZVal_ZooLib.cpp
===================================================================
--- trunk/zoolib/source/cxx/old/zoolib/ZVal_ZooLib.cpp 2012-02-01 00:07:03 UTC (rev 2703)
+++ trunk/zoolib/source/cxx/old/zoolib/ZVal_ZooLib.cpp 2012-02-01 00:10:19 UTC (rev 2704)
@@ -76,7 +76,7 @@
"Vector",
"Type",
"Time",
-//## "Name"
+//# #"Name"
};
const char* ZTypeAsString(ZType iType)
@@ -1486,7 +1486,7 @@
case eZType_Rect: delete fData.fAs_Rect; break;
case eZType_String: sDtor_T<ValString>(fType.fBytes); break;
-//## case eZType_Name: sDtor_T<ZTName>(fType.fBytes); break;
+//# #case eZType_Name: sDtor_T<ZTName>(fType.fBytes); break;
case eZType_Tuple: sDtor_T<ZMap_ZooLib>(fType.fBytes); break;
case eZType_RefCounted:
{
Modified: trunk/zoolib/source/cxx/old/zoolib/ZVal_ZooLib.h
===================================================================
--- trunk/zoolib/source/cxx/old/zoolib/ZVal_ZooLib.h 2012-02-01 00:07:03 UTC (rev 2703)
+++ trunk/zoolib/source/cxx/old/zoolib/ZVal_ZooLib.h 2012-02-01 00:10:19 UTC (rev 2704)
@@ -36,7 +36,7 @@
#include <vector>
#ifndef ZCONFIG_Val_ZooLib_Packed
-# define ZCONFIG_Val_ZooLib_Packed 1
+ #define ZCONFIG_Val_ZooLib_Packed 1
#endif
namespace ZooLib {
@@ -82,7 +82,7 @@
eZType_Vector = 18,
eZType_Type = 19,
eZType_Time = 20,
-//## eZType_Name = 21
+//# #eZType_Name = 21
eZType_Max
};
@@ -95,7 +95,7 @@
// MARK: - ZVal_ZooLib
#if ZCONFIG_Val_ZooLib_Packed
-# pragma pack(4)
+ #pragma pack(4)
#endif
class ZVal_ZooLib
@@ -275,7 +275,7 @@
};
#if ZCONFIG_Val_ZooLib_Packed
-# pragma pack()
+ #pragma pack()
#endif
// =================================================================================================
Modified: trunk/zoolib/source/cxx/old/zoolib/ZYad_ZooLibStrim.cpp
===================================================================
--- trunk/zoolib/source/cxx/old/zoolib/ZYad_ZooLibStrim.cpp 2012-02-01 00:07:03 UTC (rev 2703)
+++ trunk/zoolib/source/cxx/old/zoolib/ZYad_ZooLibStrim.cpp 2012-02-01 00:10:19 UTC (rev 2704)
@@ -165,7 +165,7 @@
else if (typeValueLC == "id") oVal = eZType_ID;
else if (typeValueLC == "vector") oVal = eZType_Vector;
else if (typeValueLC == "type") oVal = eZType_Type;
-//## else if (typeValueLC == "name") oVal = eZType_Name;
+//# #else if (typeValueLC == "name") oVal = eZType_Name;
else
spThrowParseException("Unknown type name '" + typeValue + "'");
}
Modified: trunk/zoolib/source/cxx/zoolib/ZAtomic.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZAtomic.cpp 2012-02-01 00:07:03 UTC (rev 2703)
+++ trunk/zoolib/source/cxx/zoolib/ZAtomic.cpp 2012-02-01 00:10:19 UTC (rev 2704)
@@ -31,9 +31,9 @@
#if ZCONFIG(Compiler, CodeWarrior) && ZCONFIG(Processor, PPC)
#if 0
-# define ZAtomic_PPC405_ERR77(rA,rB) dcbt rA , rB;
+ #define ZAtomic_PPC405_ERR77(rA,rB) dcbt rA , rB;
#else
-# define ZAtomic_PPC405_ERR77(rA,rB)
+ #define ZAtomic_PPC405_ERR77(rA,rB)
#endif
// We attach a register declarator to each parameter so that CW does not generate
@@ -340,7 +340,7 @@
// MARK: - A real CompareAndSwap must be defined by now
#if !defined(DEFINED_ZAtomic_CompareAndSwap)
-# error No CompareAndSwap available
+ #error No CompareAndSwap available
#endif
// =================================================================================================
Modified: trunk/zoolib/source/cxx/zoolib/ZAtomic.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZAtomic.h 2012-02-01 00:07:03 UTC (rev 2703)
+++ trunk/zoolib/source/cxx/zoolib/ZAtomic.h 2012-02-01 00:10:19 UTC (rev 2704)
@@ -111,9 +111,9 @@
can be enabled later if necessary. */
#if 0
-# define ZAtomic_PPC405_ERR77(rA,rB) "dcbt " #ra "," #rb "\n"
+ #define ZAtomic_PPC405_ERR77(rA,rB) "dcbt " #ra "," #rb "\n"
#else
-# define ZAtomic_PPC405_ERR77(rA,rB)
+ #define ZAtomic_PPC405_ERR77(rA,rB)
#endif
namespace ZooLib {
Modified: trunk/zoolib/source/cxx/zoolib/ZBlockStore_PhaseTree.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZBlockStore_PhaseTree.cpp 2012-02-01 00:07:03 UTC (rev 2703)
+++ trunk/zoolib/source/cxx/zoolib/ZBlockStore_PhaseTree.cpp 2012-02-01 00:10:19 UTC (rev 2704)
@@ -38,17 +38,17 @@
namespace ZooLib {
#ifndef kDebug_PhaseTreeFile
-# define kDebug_PhaseTreeFile 3
+ #define kDebug_PhaseTreeFile 3
#endif
#if ZCONFIG_Debug >= ZCONFIG_PhaseTree_Debug
-# define PT_INLINE
-# define ASSERT_LOCKED(a) ZAssertStop(0, a.IsLocked())
-# define ASSERT_UNLOCKED(a) ZAssertStop(0, !a.IsLocked())
+ #define PT_INLINE
+ #define ASSERT_LOCKED(a) ZAssertStop(0, a.IsLocked())
+ #define ASSERT_UNLOCKED(a) ZAssertStop(0, !a.IsLocked())
#else
-# define PT_INLINE inline
-# define ASSERT_LOCKED(a)
-# define ASSERT_UNLOCKED(a)
+ #define PT_INLINE inline
+ #define ASSERT_LOCKED(a)
+ #define ASSERT_UNLOCKED(a)
#endif
/**
Modified: trunk/zoolib/source/cxx/zoolib/ZBlockStore_PhaseTree.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZBlockStore_PhaseTree.h 2012-02-01 00:07:03 UTC (rev 2703)
+++ trunk/zoolib/source/cxx/zoolib/ZBlockStore_PhaseTree.h 2012-02-01 00:10:19 UTC (rev 2704)
@@ -30,7 +30,7 @@
#include <map>
#ifndef ZCONFIG_PhaseTree_Debug
-# define ZCONFIG_PhaseTree_Debug 3
+ #define ZCONFIG_PhaseTree_Debug 3
#endif
namespace ZooLib {
Modified: trunk/zoolib/source/cxx/zoolib/ZByteSwap.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZByteSwap.cpp 2012-02-01 00:07:03 UTC (rev 2703)
+++ trunk/zoolib/source/cxx/zoolib/ZByteSwap.cpp 2012-02-01 00:10:19 UTC (rev 2704)
@@ -23,14 +23,14 @@
// Switch off optimization for CodeWarrior -- it runs out of registers.
#if ZCONFIG(Compiler, CodeWarrior)
-# pragma push
-# pragma optimization_level 1
-# pragma opt_common_subs off
-# pragma opt_lifetimes off
-# pragma peephole off
-# if ZCONFIG(Processor, x86)
-# pragma register_coloring off
-# endif
+ #pragma push
+ #pragma optimization_level 1
+ #pragma opt_common_subs off
+ #pragma opt_lifetimes off
+ #pragma peephole off
+ #if ZCONFIG(Processor, x86)
+ #pragma register_coloring off
+ #endif
#endif
namespace ZooLib {
Modified: trunk/zoolib/source/cxx/zoolib/ZByteSwap.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZByteSwap.h 2012-02-01 00:07:03 UTC (rev 2703)
+++ trunk/zoolib/source/cxx/zoolib/ZByteSwap.h 2012-02-01 00:10:19 UTC (rev 2704)
@@ -536,11 +536,11 @@
#if !defined(ZByteSwap_EndianBig)
-# if ZCONFIG(Endian, Big)
-# define ZByteSwap_EndianBig 1
-# else
-# define ZByteSwap_EndianBig 0
-# endif
+ #if ZCONFIG(Endian, Big)
+ #define ZByteSwap_EndianBig 1
+ #else
+ #define ZByteSwap_EndianBig 0
+ #endif
inline uint16 ZByteSwap_16(uint16 iValue)
{ return (iValue >> 8) | (iValue << 8); }
Modified: trunk/zoolib/source/cxx/zoolib/ZCONFIG_SPI.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZCONFIG_SPI.h 2012-02-01 00:07:03 UTC (rev 2703)
+++ trunk/zoolib/source/cxx/zoolib/ZCONFIG_SPI.h 2012-02-01 00:10:19 UTC (rev 2704)
@@ -27,18 +27,18 @@
// Pick up Apple's config macros if they're available
#if __MACH__
-# include <AvailabilityMacros.h>
-# include <TargetConditionals.h>
+ #include <AvailabilityMacros.h>
+ #include <TargetConditionals.h>
-# if TARGET_IPHONE_SIMULATOR
-# define ZMACRO_IOS 1
-# define ZMACRO_IOS_Device 0
-# define ZMACRO_IOS_Simulator 1
-# elif TARGET_OS_IPHONE
-# define ZMACRO_IOS 1
-# define ZMACRO_IOS_Device 1
-# define ZMACRO_IOS_Simulator 0
-# endif
+ #if TARGET_IPHONE_SIMULATOR
+ #define ZMACRO_IOS 1
+ #define ZMACRO_IOS_Device 0
+ #define ZMACRO_IOS_Simulator 1
+ #elif TARGET_OS_IPHONE
+ #define ZMACRO_IOS 1
+ #define ZMACRO_IOS_Device 1
+ #define ZMACRO_IOS_Simulator 0
+ #endif
#endif
@@ -51,240 +51,240 @@
// =================================================================================================
#pragma mark AppleEvent
#ifndef ZCONFIG_SPI_Avail__AppleEvent
-# define ZCONFIG_SPI_Avail__AppleEvent \
+ #define ZCONFIG_SPI_Avail__AppleEvent \
(ZCONFIG_SPI_Avail__Carbon64 && ZCONFIG_SPI_Desired__Carbon64)
#endif
#ifndef ZCONFIG_SPI_Desired__AppleEvent
-# define ZCONFIG_SPI_Desired__AppleEvent 1
+ #define ZCONFIG_SPI_Desired__AppleEvent 1
#endif
// =================================================================================================
#pragma mark BeOS
#ifndef ZCONFIG_SPI_Avail__BeOS
-# define ZCONFIG_SPI_Avail__BeOS 0
+ #define ZCONFIG_SPI_Avail__BeOS 0
#endif
#ifndef ZCONFIG_SPI_Desired__BeOS
-# define ZCONFIG_SPI_Desired__BeOS 1
+ #define ZCONFIG_SPI_Desired__BeOS 1
#endif
// =================================================================================================
#pragma mark BerkeleyDB
#ifndef ZCONFIG_SPI_Avail__BerkeleyDB
-# define ZCONFIG_SPI_Avail__BerkeleyDB (ZCONFIG_SPI_Avail__POSIX && ZCONFIG_SPI_Desired__POSIX)
+ #define ZCONFIG_SPI_Avail__BerkeleyDB (ZCONFIG_SPI_Avail__POSIX && ZCONFIG_SPI_Desired__POSIX)
#endif
#ifndef ZCONFIG_SPI_Avail__BerkeleyDB
-# define ZCONFIG_SPI_Avail__BerkeleyDB 0
+ #define ZCONFIG_SPI_Avail__BerkeleyDB 0
#endif
#ifndef ZCONFIG_SPI_Desired__BerkeleyDB
-# define ZCONFIG_SPI_Desired__BerkeleyDB 1
+ #define ZCONFIG_SPI_Desired__BerkeleyDB 1
#endif
// =================================================================================================
#pragma mark boost
#ifndef ZCONFIG_SPI_Avail__boost
-# define ZCONFIG_SPI_Avail__boost 0
+ #define ZCONFIG_SPI_Avail__boost 0
#endif
#ifndef ZCONFIG_SPI_Desired__boost
-# define ZCONFIG_SPI_Desired__boost 1
+ #define ZCONFIG_SPI_Desired__boost 1
#endif
// =================================================================================================
#pragma mark BSD
#ifndef ZCONFIG_SPI_Avail__BSD
-# if defined(__APPLE__) \
+ #if defined(__APPLE__) \
|| defined(__NetBSD__) \
|| defined(__FreeBSD__) \
|| defined(__OpenBSD__)
-# define ZCONFIG_SPI_Avail__BSD 1
-# endif
+ #define ZCONFIG_SPI_Avail__BSD 1
+ #endif
#endif
#ifndef ZCONFIG_SPI_Avail__BSD
-# define ZCONFIG_SPI_Avail__BSD 0
+ #define ZCONFIG_SPI_Avail__BSD 0
#endif
#ifndef ZCONFIG_SPI_Desired__BSD
-# define ZCONFIG_SPI_Desired__BSD 1
+ #define ZCONFIG_SPI_Desired__BSD 1
#endif
// =================================================================================================
#pragma mark bzip2
#ifndef ZCONFIG_SPI_Avail__bzip2
-# define ZCONFIG_SPI_Avail__bzip2 0
+ #define ZCONFIG_SPI_Avail__bzip2 0
#endif
#ifndef ZCONFIG_SPI_Desired__bzip2
-# define ZCONFIG_SPI_Desired__bzip2 1
+ #define ZCONFIG_SPI_Desired__bzip2 1
#endif
// =================================================================================================
#pragma mark Carbon
#ifndef ZCONFIG_SPI_Avail__Carbon
-# if __MACH__
-# if ! ZMACRO_IOS && ! __LP64__
-# define ZCONFIG_SPI_Avail__Carbon 1
-# endif
-# elif macintosh
-# if TARGET_API_MAC_CARBON
-# define ZCONFIG_SPI_Avail__Carbon 1
-# elif TARGET_CARBON
-# define ZCONFIG_SPI_Avail__Carbon 1
-# endif
-# endif
+ #if __MACH__
+ #if ! ZMACRO_IOS && ! __LP64__
+ #define ZCONFIG_SPI_Avail__Carbon 1
+ #endif
+ #elif macintosh
+ #if TARGET_API_MAC_CARBON
+ #define ZCONFIG_SPI_Avail__Carbon 1
+ #elif TARGET_CARBON
+ #define ZCONFIG_SPI_Avail__Carbon 1
+ #endif
+ #endif
#endif
#ifndef ZCONFIG_SPI_Avail__Carbon
-# define ZCONFIG_SPI_Avail__Carbon 0
+ #define ZCONFIG_SPI_Avail__Carbon 0
#endif
#ifndef ZCONFIG_SPI_Desired__Carbon
-# define ZCONFIG_SPI_Desired__Carbon 1
+ #define ZCONFIG_SPI_Desired__Carbon 1
#endif
// =================================================================================================
#pragma mark Carbon64
#ifndef ZCONFIG_SPI_Avail__Carbon64
-# if ZCONFIG_SPI_Avail__Carbon
-# define ZCONFIG_SPI_Avail__Carbon64 1
-# elif __MACH__
-# if ! ZMACRO_IOS
-# define ZCONFIG_SPI_Avail__Carbon64 1
-# endif
-# endif
+ #if ZCONFIG_SPI_Avail__Carbon
+ #define ZCONFIG_SPI_Avail__Carbon64 1
+ #elif __MACH__
+ #if ! ZMACRO_IOS
+ #define ZCONFIG_SPI_Avail__Carbon64 1
+ #endif
+ #endif
#endif
#ifndef ZCONFIG_SPI_Avail__Carbon64
-# define ZCONFIG_SPI_Avail__Carbon64 0
+ #define ZCONFIG_SPI_Avail__Carbon64 0
#endif
#ifndef ZCONFIG_SPI_Desired__Carbon64
-# define ZCONFIG_SPI_Desired__Carbon64 1
+ #define ZCONFIG_SPI_Desired__Carbon64 1
#endif
// =================================================================================================
#pragma mark CFType
#ifndef ZCONFIG_SPI_Avail__CFType
-# if __MACH__
-# define ZCONFIG_SPI_Avail__CFType 1
-# elif ZCONFIG_SPI_Avail__Carbon64
-# define ZCONFIG_SPI_Avail__CFType 1
-# endif
+ #if __MACH__
+ #define ZCONFIG_SPI_Avail__CFType 1
+ #elif ZCONFIG_SPI_Avail__Carbon64
+ #define ZCONFIG_SPI_Avail__CFType 1
+ #endif
#endif
#ifndef ZCONFIG_SPI_Avail__CFType
-# define ZCONFIG_SPI_Avail__CFType 0
+ #define ZCONFIG_SPI_Avail__CFType 0
#endif
#ifndef ZCONFIG_SPI_Desired__CFType
-# define ZCONFIG_SPI_Desired__CFType 1
+ #define ZCONFIG_SPI_Desired__CFType 1
#endif
// =================================================================================================
#pragma mark Cocoa
#ifndef ZCONFIG_SPI_Avail__Cocoa
-# if __MACH__
-# define ZCONFIG_SPI_Avail__Cocoa 1
-# elif __COCOTRON__
-# define ZCONFIG_SPI_Avail__Cocoa 1
-# endif
+ #if __MACH__
+ #define ZCONFIG_SPI_Avail__Cocoa 1
+ #elif __COCOTRON__
+ #define ZCONFIG_SPI_Avail__Cocoa 1
+ #endif
#endif
#ifndef ZCONFIG_SPI_Avail__Cocoa
-# define ZCONFIG_SPI_Avail__Cocoa 0
+ #define ZCONFIG_SPI_Avail__Cocoa 0
#endif
#ifndef ZCONFIG_SPI_Desired__Cocoa
-# define ZCONFIG_SPI_Desired__Cocoa 1
+ #define ZCONFIG_SPI_Desired__Cocoa 1
#endif
// =================================================================================================
#pragma mark CocoaFoundation
#ifndef ZCONFIG_SPI_Avail__CocoaFoundation
-# if __MACH__
-# define ZCONFIG_SPI_Avail__CocoaFoundation 1
-# elif __COCOTRON__
-# define ZCONFIG_SPI_Avail__CocoaFoundation 1
-# endif
+ #if __MACH__
+ #define ZCONFIG_SPI_Avail__CocoaFoundation 1
+ #elif __COCOTRON__
+ #define ZCONFIG_SPI_Avail__CocoaFoundation 1
+ #endif
#endif
#ifndef ZCONFIG_SPI_Avail__CocoaFoundation
-# define ZCONFIG_SPI_Avail__CocoaFoundation 0
+ #define ZCONFIG_SPI_Avail__CocoaFoundation 0
#endif
#ifndef ZCONFIG_SPI_Desired__CocoaFoundation
-# define ZCONFIG_SPI_Desired__CocoaFoundation 1
+ #define ZCONFIG_SPI_Desired__CocoaFoundation 1
#endif
// =================================================================================================
#pragma mark CocoaAppKit
#ifndef ZCONFIG_SPI_Avail__CocoaAppKit
-# if __MACH__
-# define ZCONFIG_SPI_Avail__CocoaAppKit (!ZMACRO_IOS)
-# elif __COCOTRON__
-# define ZCONFIG_SPI_Avail__CocoaAppKit 1
-# endif
+ #if __MACH__
+ #define ZCONFIG_SPI_Avail__CocoaAppKit (!ZMACRO_IOS)
+ #elif __COCOTRON__
+ #define ZCONFIG_SPI_Avail__CocoaAppKit 1
+ #endif
#endif
#ifndef ZCONFIG_SPI_Avail__CocoaAppKit
-# define ZCONFIG_SPI_Avail__CocoaAppKit 0
+ #define ZCONFIG_SPI_Avail__CocoaAppKit 0
#endif
#ifndef ZCONFIG_SPI_Desired__CocoaAppKit
-# define ZCONFIG_SPI_Desired__CocoaAppKit 1
+ #define ZCONFIG_SPI_Desired__CocoaAppKit 1
#endif
// =================================================================================================
#pragma mark CoreFoundation
#ifndef ZCONFIG_SPI_Avail__CoreFoundation
-# if __MACH__
-# define ZCONFIG_SPI_Avail__CoreFoundation 1
-# elif ZCONFIG_SPI_Avail__Carbon64
-# define ZCONFIG_SPI_Avail__CoreFoundation 1
-# endif
+ #if __MACH__
+ #define ZCONFIG_SPI_Avail__CoreFoundation 1
+ #elif ZCONFIG_SPI_Avail__Carbon64
+ #define ZCONFIG_SPI_Avail__CoreFoundation 1
+ #endif
#endif
#ifndef ZCONFIG_SPI_Avail__CoreFoundation
-# define ZCONFIG_SPI_Avail__CoreFoundation 0
+ #define ZCONFIG_SPI_Avail__CoreFoundation 0
#endif
#ifndef ZCONFIG_SPI_Desired__CoreFoundation
-# define ZCONFIG_SPI_Desired__CoreFoundation 1
+ #define ZCONFIG_SPI_Desired__CoreFoundation 1
#endif
// =================================================================================================
#pragma mark CoreGraphics
#ifndef ZCONFIG_SPI_Avail__CoreGraphics
-# if __MACH__
-# define ZCONFIG_SPI_Avail__CoreGraphics 1
-# endif
+ #if __MACH__
+ #define ZCONFIG_SPI_Avail__CoreGraphics 1
+ #endif
#endif
#ifndef ZCONFIG_SPI_Avail__CoreGraphics
-# define ZCONFIG_SPI_Avail__CoreGraphics 0
+ #define ZCONFIG_SPI_Avail__CoreGraphics 0
#endif
#ifndef ZCONFIG_SPI_Desired__CoreGraphics
-# define ZCONFIG_SPI_Desired__CoreGraphics 1
+ #define ZCONFIG_SPI_Desired__CoreGraphics 1
#endif
@@ -293,63 +293,63 @@
#ifndef ZCONFIG_SPI_Avail__DNSSD
// Not sure about this one. Assumes POSIX for now, may need to drop back
// to MacOSX and Linux only (by default).
-# define ZCONFIG_SPI_Avail__DNSSD (ZCONFIG_SPI_Avail__POSIX && ZCONFIG_SPI_Desired__POSIX)
+ #define ZCONFIG_SPI_Avail__DNSSD (ZCONFIG_SPI_Avail__POSIX && ZCONFIG_SPI_Desired__POSIX)
#endif
#ifndef ZCONFIG_SPI_Avail__DNSSD
-# define ZCONFIG_SPI_Avail__DNSSD 0
+ #define ZCONFIG_SPI_Avail__DNSSD 0
#endif
#ifndef ZCONFIG_SPI_Desired__DNSSD
-# define ZCONFIG_SPI_Desired__DNSSD 1
+ #define ZCONFIG_SPI_Desired__DNSSD 1
#endif
// =================================================================================================
#pragma mark GDI
#ifndef ZCONFIG_SPI_Avail__GDI
-# define ZCONFIG_SPI_Avail__GDI (ZCONFIG_SPI_Avail__Win && ZCONFIG_SPI_Desired__Win)
+ #define ZCONFIG_SPI_Avail__GDI (ZCONFIG_SPI_Avail__Win && ZCONFIG_SPI_Desired__Win)
#endif
#ifndef ZCONFIG_SPI_Avail__GDI
-# define ZCONFIG_SPI_Avail__GDI 0
+ #define ZCONFIG_SPI_Avail__GDI 0
#endif
#ifndef ZCONFIG_SPI_Desired__GDI
-# define ZCONFIG_SPI_Desired__GDI 1
+ #define ZCONFIG_SPI_Desired__GDI 1
#endif
// =================================================================================================
#pragma mark iconv
#ifndef ZCONFIG_SPI_Avail__iconv
-# define ZCONFIG_SPI_Avail__iconv \
+ #define ZCONFIG_SPI_Avail__iconv \
((ZCONFIG_SPI_Avail__MacOSX && ZCONFIG_SPI_Desired__MacOSX) || ZMACRO_IOS)
#endif
#ifndef ZCONFIG_SPI_Desired__iconv
-# define ZCONFIG_SPI_Desired__iconv 1
+ #define ZCONFIG_SPI_Desired__iconv 1
#endif
// =================================================================================================
#pragma mark ICU
#ifndef ZCONFIG_SPI_Avail__ICU
-# define ZCONFIG_SPI_Avail__ICU 0
+ #define ZCONFIG_SPI_Avail__ICU 0
#endif
#ifndef ZCONFIG_SPI_Desired__ICU
-# define ZCONFIG_SPI_Desired__ICU 1
+ #define ZCONFIG_SPI_Desired__ICU 1
#endif
// =================================================================================================
#pragma mark imagehlp
#ifndef ZCONFIG_SPI_Avail__imagehlp
-# define ZCONFIG_SPI_Avail__imagehlp 0
+ #define ZCONFIG_SPI_Avail__imagehlp 0
#endif
#ifndef ZCONFIG_SPI_Desired__imagehlp
-# define ZCONFIG_SPI_Desired__imagehlp 1
+ #define ZCONFIG_SPI_Desired__imagehlp 1
#endif
@@ -357,218 +357,218 @@
#pragma mark iPhone
#ifndef ZCONFIG_SPI_Avail__iPhone
-# if ZMACRO_IOS
-# define ZCONFIG_SPI_Avail__iPhone 1
-# endif
+ #if ZMACRO_IOS
+ #define ZCONFIG_SPI_Avail__iPhone 1
+ #endif
#endif
#ifndef ZCONFIG_SPI_Avail__iPhone
-# define ZCONFIG_SPI_Avail__iPhone 0
+ #define ZCONFIG_SPI_Avail__iPhone 0
#endif
#ifndef ZCONFIG_SPI_Desired__iPhone
-# define ZCONFIG_SPI_Desired__iPhone 1
+ #define ZCONFIG_SPI_Desired__iPhone 1
#endif
// =================================================================================================
#pragma mark Linux
#ifndef ZCONFIG_SPI_Avail__Linux
-# ifdef linux
-# define ZCONFIG_SPI_Avail__Linux 1
-# endif
+ #ifdef linux
+ #define ZCONFIG_SPI_Avail__Linux 1
+ #endif
#endif
#ifndef ZCONFIG_SPI_Avail__Linux
-# define ZCONFIG_SPI_Avail__Linux 0
+ #define ZCONFIG_SPI_Avail__Linux 0
#endif
#ifndef ZCONFIG_SPI_Desired__Linux
-# define ZCONFIG_SPI_Desired__Linux 1
+ #define ZCONFIG_SPI_Desired__Linux 1
#endif
// =================================================================================================
#pragma mark MacClassic
#ifndef ZCONFIG_SPI_Avail__MacClassic
-# if macintosh && ! ZCONFIG_SPI_Avail__Carbon
-# define ZCONFIG_SPI_Avail__MacClassic 1
-# endif
+ #if macintosh && ! ZCONFIG_SPI_Avail__Carbon
+ #define ZCONFIG_SPI_Avail__MacClassic 1
+ #endif
#endif
#ifndef ZCONFIG_SPI_Avail__MacClassic
-# define ZCONFIG_SPI_Avail__MacClassic 0
+ #define ZCONFIG_SPI_Avail__MacClassic 0
#endif
#ifndef ZCONFIG_SPI_Desired__MacClassic
-# define ZCONFIG_SPI_Desired__MacClassic 1
+ #define ZCONFIG_SPI_Desired__MacClassic 1
#endif
// =================================================================================================
#pragma mark MacMP
#ifndef ZCONFIG_SPI_Avail__MacMP
-# if macintosh || ZCONFIG_SPI_Avail__Carbon64
-# define ZCONFIG_SPI_Avail__MacMP 1
-# endif
+ #if macintosh || ZCONFIG_SPI_Avail__Carbon64
+ #define ZCONFIG_SPI_Avail__MacMP 1
+ #endif
#endif
#ifndef ZCONFIG_SPI_Avail__MacMP
-# define ZCONFIG_SPI_Avail__MacMP 0
+ #define ZCONFIG_SPI_Avail__MacMP 0
#endif
#ifndef ZCONFIG_SPI_Desired__MacMP
-# define ZCONFIG_SPI_Desired__MacMP 1
+ #define ZCONFIG_SPI_Desired__MacMP 1
#endif
// =================================================================================================
#pragma mark MacOSX
#ifndef ZCONFIG_SPI_Avail__MacOSX
-# if __MACH__ && ! ZMACRO_IOS
-# define ZCONFIG_SPI_Avail__MacOSX 1
-# endif
+ #if __MACH__ && ! ZMACRO_IOS
+ #define ZCONFIG_SPI_Avail__MacOSX 1
+ #endif
#endif
#ifndef ZCONFIG_SPI_Avail__MacOSX
-# define ZCONFIG_SPI_Avail__MacOSX 0
+ #define ZCONFIG_SPI_Avail__MacOSX 0
#endif
#ifndef ZCONFIG_SPI_Desired__MacOSX
-# define ZCONFIG_SPI_Desired__MacOSX 1
+ #define ZCONFIG_SPI_Desired__MacOSX 1
#endif
// =================================================================================================
#pragma mark openssl
#ifndef ZCONFIG_SPI_Avail__openssl
-# define ZCONFIG_SPI_Avail__openssl 0
+ #define ZCONFIG_SPI_Avail__openssl 0
#endif
#ifndef ZCONFIG_SPI_Desired__openssl
-# define ZCONFIG_SPI_Desired__openssl 1
+ #define ZCONFIG_SPI_Desired__openssl 1
#endif
// =================================================================================================
#pragma mark POSIX
#ifndef ZCONFIG_SPI_Avail__POSIX
-# if __MACH__
-# define ZCONFIG_SPI_Avail__POSIX 1
-# elif linux
-# define ZCONFIG_SPI_Avail__POSIX 1
-# endif
+ #if __MACH__
+ #define ZCONFIG_SPI_Avail__POSIX 1
+ #elif linux
+ #define ZCONFIG_SPI_Avail__POSIX 1
+ #endif
#endif
#ifndef ZCONFIG_SPI_Avail__POSIX
-# define ZCONFIG_SPI_Avail__POSIX 0
+ #define ZCONFIG_SPI_Avail__POSIX 0
#endif
#ifndef ZCONFIG_SPI_Desired__POSIX
-# define ZCONFIG_SPI_Desired__POSIX 1
+ #define ZCONFIG_SPI_Desired__POSIX 1
#endif
// =================================================================================================
#pragma mark pthread
#ifndef ZCONFIG_SPI_Avail__pthread
-# define ZCONFIG_SPI_Avail__pthread (ZCONFIG_SPI_Avail__POSIX && ZCONFIG_SPI_Desired__POSIX)
+ #define ZCONFIG_SPI_Avail__pthread (ZCONFIG_SPI_Avail__POSIX && ZCONFIG_SPI_Desired__POSIX)
#endif
#ifndef ZCONFIG_SPI_Avail__pthread
-# define ZCONFIG_SPI_Avail__pthread 0
+ #define ZCONFIG_SPI_Avail__pthread 0
#endif
#ifndef ZCONFIG_SPI_Desired__pthread
-# define ZCONFIG_SPI_Desired__pthread 1
+ #define ZCONFIG_SPI_Desired__pthread 1
#endif
// =================================================================================================
#pragma mark QuickDraw
#ifndef ZCONFIG_SPI_Avail__QuickDraw
-# define ZCONFIG_SPI_Avail__QuickDraw \
+ #define ZCONFIG_SPI_Avail__QuickDraw \
((ZCONFIG_SPI_Avail__Carbon && ZCONFIG_SPI_Desired__Carbon) \
|| (ZCONFIG_SPI_Avail__MacClassic && ZCONFIG_SPI_Desired__MacClassic))
#endif
#ifndef ZCONFIG_SPI_Avail__QuickDraw
-# define ZCONFIG_SPI_Avail__QuickDraw 0
+ #define ZCONFIG_SPI_Avail__QuickDraw 0
#endif
#ifndef ZCONFIG_SPI_Desired__QuickDraw
-# define ZCONFIG_SPI_Desired__QuickDraw 1
+ #define ZCONFIG_SPI_Desired__QuickDraw 1
#endif
// =================================================================================================
#pragma mark stlsoft
#ifndef ZCONFIG_SPI_Avail__stlsoft
-# define ZCONFIG_SPI_Avail__stlsoft 0
+ #define ZCONFIG_SPI_Avail__stlsoft 0
#endif
#ifndef ZCONFIG_SPI_Desired__stlsoft
-# define ZCONFIG_SPI_Desired__stlsoft 1
+ #define ZCONFIG_SPI_Desired__stlsoft 1
#endif
// =================================================================================================
#pragma mark SystemConfiguration
#ifndef ZCONFIG_SPI_Avail__SystemConfiguration
-# define ZCONFIG_SPI_Avail__SystemConfiguration ZCONFIG_SPI_Avail__MacOSX
+ #define ZCONFIG_SPI_Avail__SystemConfiguration ZCONFIG_SPI_Avail__MacOSX
#endif
#ifndef ZCONFIG_SPI_Avail__SystemConfiguration
-# define ZCONFIG_SPI_Avail__SystemConfiguration 0
+ #define ZCONFIG_SPI_Avail__SystemConfiguration 0
#endif
#ifndef ZCONFIG_SPI_Desired__SystemConfiguration
-# define ZCONFIG_SPI_Desired__SystemConfiguration 1
+ #define ZCONFIG_SPI_Desired__SystemConfiguration 1
#endif
// =================================================================================================
#pragma mark Win
#ifndef ZCONFIG_SPI_Avail__Win
-# if defined(WIN32) || defined(_WIN32) || defined(WINDOWS)
-# define ZCONFIG_SPI_Avail__Win 1
-# elif __MWERKS__ && __INTEL__
-# define ZCONFIG_SPI_Avail__Win 1
-# endif
+ #if defined(WIN32) || defined(_WIN32) || defined(WINDOWS)
+ #define ZCONFIG_SPI_Avail__Win 1
+ #elif __MWERKS__ && __INTEL__
+ #define ZCONFIG_SPI_Avail__Win 1
+ #endif
#endif
#ifndef ZCONFIG_SPI_Avail__Win
-# define ZCONFIG_SPI_Avail__Win 0
+ #define ZCONFIG_SPI_Avail__Win 0
#endif
#ifndef ZCONFIG_SPI_Desired__Win
-# define ZCONFIG_SPI_Desired__Win 1
+ #define ZCONFIG_SPI_Desired__Win 1
#endif
// =================================================================================================
#pragma mark X11
//#ifndef ZCONFIG_SPI_Avail__X11
-//# define ZCONFIG_SPI_Avail__X11 (ZCONFIG_SPI_Avail__POSIX && ZCONFIG_SPI_Desired__POSIX)
+// #define ZCONFIG_SPI_Avail__X11 (ZCONFIG_SPI_Avail__POSIX && ZCONFIG_SPI_Desired__POSIX)
//#endif
#ifndef ZCONFIG_SPI_Avail__X11
-# define ZCONFIG_SPI_Avail__X11 0
+ #define ZCONFIG_SPI_Avail__X11 0
#endif
#ifndef ZCONFIG_SPI_Desired__X11
-# define ZCONFIG_SPI_Desired__X11 1
+ #define ZCONFIG_SPI_Desired__X11 1
#endif
// =================================================================================================
#pragma mark zlib
#ifndef ZCONFIG_SPI_Avail__zlib
-# define ZCONFIG_SPI_Avail__zlib 0
+ #define ZCONFIG_SPI_Avail__zlib 0
#endif
#ifndef ZCONFIG_SPI_Desired__zlib
-# define ZCONFIG_SPI_Desired__zlib 1
+ #define ZCONFIG_SPI_Desired__zlib 1
#endif
Modified: trunk/zoolib/source/cxx/zoolib/ZCaller_CFRunLoop.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZCaller_CFRunLoop.h 2012-02-01 00:07:03 UTC (rev 2703)
+++ trunk/zoolib/source/cxx/zoolib/ZCaller_CFRunLoop.h 2012-02-01 00:10:19 UTC (rev 2704)
@@ -28,17 +28,17 @@
// CFRunLoop is not available in CW's headers
#ifndef ZCONFIG_API_Avail__Caller_CFRunLoop
-# if ZCONFIG_SPI_Enabled(CoreFoundation) && !ZCONFIG(Compiler,CodeWarrior)
-# define ZCONFIG_API_Avail__Caller_CFRunLoop 1
-# endif
+ #if ZCONFIG_SPI_Enabled(CoreFoundation) && !ZCONFIG(Compiler,CodeWarrior)
+ #define ZCONFIG_API_Avail__Caller_CFRunLoop 1
+ #endif
#endif
#ifndef ZCONFIG_API_Avail__Caller_CFRunLoop
-# define ZCONFIG_API_Avail__Caller_CFRunLoop 0
+ #define ZCONFIG_API_Avail__Caller_CFRunLoop 0
#endif
#ifndef ZCONFIG_API_Desired__Caller_CFRunLoop
-# define ZCONFIG_API_Desired__Caller_CFRunLoop 1
+ #define ZCONFIG_API_Desired__Caller_CFRunLoop 1
#endif
#if ZCONFIG_API_Enabled(Caller_CFRunLoop)
Modified: trunk/zoolib/source/cxx/zoolib/ZCompare_T.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZCompare_T.h 2012-02-01 00:07:03 UTC (rev 2703)
+++ trunk/zoolib/source/cxx/zoolib/ZCompare_T.h 2012-02-01 00:10:19 UTC (rev 2704)
@@ -100,4 +100,4 @@
} // namespace ZooLib
-#endif // __ZCompare_Vector_h__
+#endif // __ZCompare_T_h__
Modified: trunk/zoolib/source/cxx/zoolib/ZCompat_Win.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZCompat_Win.h 2012-02-01 00:07:03 UTC (rev 2703)
+++ trunk/zoolib/source/cxx/zoolib/ZCompat_Win.h 2012-02-01 00:10:19 UTC (rev 2704)
@@ -31,15 +31,15 @@
// If not otherwise specified, require Windows 2K.
#ifndef _WIN32_WINNT
-# define _WIN32_WINNT 0x0500
+ #define _WIN32_WINNT 0x0500
#endif
#ifndef NOMINMAX
-# define NOMINMAX
+ #define NOMINMAX
#endif
#ifndef STRICT
-# define STRICT
+ #define STRICT
#endif
// Recent windows headers conditionalize visibility of GetModuleHandleExW on
Modified: trunk/zoolib/source/cxx/zoolib/ZCompat_Xlib.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZCompat_Xlib.h 2012-02-01 00:07:03 UTC (rev 2703)
+++ trunk/zoolib/source/cxx/zoolib/ZCompat_Xlib.h 2012-02-01 00:10:19 UTC (rev 2704)
@@ -26,9 +26,9 @@
#if ZCONFIG_SPI_Enabled(X11)
// Unfortunately, QuickDraw also defines Cursor. For the moment this lets us compile
// code that sees both QuickDraw and X11 headers. And don't get me started on BOOL ...
-# define Cursor ZooLib_X11_Cursor
-# include <X11/Xlib.h>
-# undef Cursor
+ #define Cursor ZooLib_X11_Cursor
+ #include <X11/Xlib.h>
+ #undef Cursor
#endif
#endif // __ZCompat_XLib_h__
Modified: trunk/zoolib/source/cxx/zoolib/ZCompat_algorithm.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZCompat_algorithm.h 2012-02-01 00:07:03 UTC (rev 2703)
+++ trunk/zoolib/source/cxx/zoolib/ZCompat_algorithm.h 2012-02-01 00:10:19 UTC (rev 2704)
@@ -23,9 +23,9 @@
#include "zconfig.h"
#if !defined(__MWERKS__) && defined(_MSC_VER) && (_MSC_VER < 1200)
-# include <algorithm.h>
+ #include <algorithm.h>
#else
-# include <algorithm>
+ #include <algorithm>
#endif
namespace ZooLib {
Modified: trunk/zoolib/source/cxx/zoolib/ZCompat_string.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZCompat_string.h 2012-02-01 00:07:03 UTC (rev 2703)
+++ trunk/zoolib/source/cxx/zoolib/ZCompat_string.h 2012-02-01 00:10:19 UTC (rev 2704)
@@ -26,7 +26,7 @@
// strdup doesn't show up on older versions of CW
#if defined(__MWERKS__) && __MWERKS__ <= 0x2406
-# include <extras.h>
+ #include <extras.h>
#endif
#endif // __ZCompat_string_h__
Modified: trunk/zoolib/source/cxx/zoolib/ZDCFont.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZDCFont.cpp 2012-02-01 00:07:03 UTC (rev 2703)
+++ trunk/zoolib/source/cxx/zoolib/ZDCFont.cpp 2012-02-01 00:10:19 UTC (rev 2704)
@@ -30,7 +30,7 @@
#include "zoolib/ZUnicode.h"
#if ZCONFIG_SPI_Enabled(QuickDraw)
-# include ZMACINCLUDE3(ApplicationServices,QD,Fonts.h)
+ #include ZMACINCLUDE3(ApplicationServices,QD,Fonts.h)
#endif
namespace ZooLib {
Modified: trunk/zoolib/source/cxx/zoolib/ZDCFont.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZDCFont.h 2012-02-01 00:07:03 UTC (rev 2703)
+++ trunk/zoolib/source/cxx/zoolib/ZDCFont.h 2012-02-01 00:10:19 UTC (rev 2704)
@@ -27,11 +27,11 @@
#include "zoolib/ZUnicodeString.h"
#if ZCONFIG_SPI_Enabled(QuickDraw)
-# include ZMACINCLUDE3(Carbon,HIToolbox,TextEdit.h)
+ #include ZMACINCLUDE3(Carbon,HIToolbox,TextEdit.h)
#endif
#if ZCONFIG_SPI_Enabled(BeOS)
-# include <interface/Font.h>
+ #include <interface/Font.h>
#en...
[truncated message content] |
