diff options
author | Jonathan Kew <jfkthame@googlemail.com> | 2008-02-08 17:28:24 +0000 |
---|---|---|
committer | Jonathan Kew <jfkthame@googlemail.com> | 2008-02-08 17:28:24 +0000 |
commit | d930e60f53da36d97d91f77e00d01c242f4aba37 (patch) | |
tree | 10508a97e179a73aaca1fcc9d79a3de24026bfd4 /Build/source/libs/graphite-engine/src/segment/Main.h | |
parent | fcfc8e4880e9573c7c7e54476667079a8269f0fb (diff) |
graphite update (synch with XeTeX repository rev.562)
git-svn-id: svn://tug.org/texlive/trunk@6568 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/graphite-engine/src/segment/Main.h')
-rw-r--r-- | Build/source/libs/graphite-engine/src/segment/Main.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/Build/source/libs/graphite-engine/src/segment/Main.h b/Build/source/libs/graphite-engine/src/segment/Main.h index def3d771c7b..5fed3be3973 100644 --- a/Build/source/libs/graphite-engine/src/segment/Main.h +++ b/Build/source/libs/graphite-engine/src/segment/Main.h @@ -22,9 +22,11 @@ Description: #define NO_EXCEPTIONS 1 // It's okay to use functions that were declared deprecated by VS 2005: +#ifdef _MSC_VER #define _CRT_SECURE_NO_DEPRECATE #pragma warning(disable: 4996) // warning: function was declared deprecated #pragma warning(disable: 4702) // unreachable code +#endif #include "GrCommon.h" @@ -150,11 +152,12 @@ struct Rect #include "FontFace.h" #include "Segment.h" #include "SegmentPainter.h" -#ifdef _WIN32 -#include <hash_map> -#include "WinFont.h" -#include "WinSegmentPainter.h" -#endif + +//#ifdef _WIN32 +//#include <hash_map> +//#include "WinFont.h" +//#include "WinSegmentPainter.h" +//#endif // Internal headers #include "TtfUtil.h" |