diff options
| author |  reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-01-26 04:37:53 +0000 |
|---|---|---|
| committer | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-01-26 04:37:53 +0000 |
| commit | c93a17f2dffbe4462d1f0975bc53f26e1ec40965 (patch) | |
| tree | d07bba5de0cc24c7517cc7c9e4b10160f80035c3 | |
| parent | 386900790bbb2c07a6cc39bd46feb2e6526dbe01 (diff) | |
fix mac build (don't need typedef struct foo foo)
git-svn-id: http://skia.googlecode.com/svn/trunk@733 2bbb7eff-a529-9590-31e7-b0007b416f81
| -rw-r--r-- | include/pdf/SkPDFTypefaceInfo.h | 1 | ||||
| -rw-r--r-- | xcode/maccore/maccore.xcodeproj/project.pbxproj | 11 |
2 files changed, 9 insertions, 3 deletions
diff --git a/include/pdf/SkPDFTypefaceInfo.h b/include/pdf/SkPDFTypefaceInfo.h index 2655d14abf..00338c4dc8 100644 --- a/include/pdf/SkPDFTypefaceInfo.h +++ b/include/pdf/SkPDFTypefaceInfo.h @@ -73,7 +73,6 @@ public: int fOriginXDisp; // Horizontal displacement of the secondary origin. int fOriginYDisp; // Vertical displacement of the secondary origin. }; - typedef struct VerticalMetric VerticalMetric; typedef AdvanceMetric<int> WidthRange; typedef AdvanceMetric<VerticalMetric> VerticalAdvanceRange; diff --git a/xcode/maccore/maccore.xcodeproj/project.pbxproj b/xcode/maccore/maccore.xcodeproj/project.pbxproj index 65c9990890..7d4ccbafd8 100644 --- a/xcode/maccore/maccore.xcodeproj/project.pbxproj +++ b/xcode/maccore/maccore.xcodeproj/project.pbxproj @@ -14,10 +14,10 @@ 002884E10EFABFFC0083E387 /* SkGlobals_global.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 002884E00EFABFFC0083E387 /* SkGlobals_global.cpp */; }; 003144D50FB8491400B10956 /* SkImageDecoder_CG.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 27739F2E0F11409100F233EA /* SkImageDecoder_CG.cpp */; }; 00488AF40F86532E00C08A57 /* SkDebug_stdio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00488AF30F86532E00C08A57 /* SkDebug_stdio.cpp */; }; + 005B11BF12EFDC2D00A08864 /* SkFontHost_mac_coretext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 27D0F41C11BD227D001B8EBE /* SkFontHost_mac_coretext.cpp */; }; 007C8DC910B4694D008CDB57 /* SkUtils_opts_none.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 007C8DC810B4694D008CDB57 /* SkUtils_opts_none.cpp */; }; 27739F2B0F11407000F233EA /* SkCreateCGImageRef.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 27739F2A0F11407000F233EA /* SkCreateCGImageRef.cpp */; }; 27739F2D0F11408100F233EA /* SkImageDecoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 27739F2C0F11408100F233EA /* SkImageDecoder.cpp */; }; - 27D0F42F11BD234C001B8EBE /* SkFontHost_mac_atsui.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 27D0F41B11BD227D001B8EBE /* SkFontHost_mac_atsui.cpp */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -150,7 +150,14 @@ isa = PBXProject; buildConfigurationList = 1DEB91EF08733DB70010E9CD /* Build configuration list for PBXProject "maccore" */; compatibilityVersion = "Xcode 2.4"; + developmentRegion = English; hasScannedForEncodings = 1; + knownRegions = ( + English, + Japanese, + French, + German, + ); mainGroup = 08FB7794FE84155DC02AAC07 /* maccore */; projectDirPath = ""; projectRoot = ""; @@ -175,7 +182,7 @@ 00488AF40F86532E00C08A57 /* SkDebug_stdio.cpp in Sources */, 003144D50FB8491400B10956 /* SkImageDecoder_CG.cpp in Sources */, 007C8DC910B4694D008CDB57 /* SkUtils_opts_none.cpp in Sources */, - 27D0F42F11BD234C001B8EBE /* SkFontHost_mac_atsui.cpp in Sources */, + 005B11BF12EFDC2D00A08864 /* SkFontHost_mac_coretext.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; |