diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-04 04:38:31 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-04 04:38:31 +0000 |
| commit | 47f94e3659817effcacdc4b5699eed1f9a299a9d (patch) | |
| tree | 560e30eb62917393b6e62f1a1f7ee949321863e8 | |
| parent | 8a21b7740892fca5640daae5767e7d791e90487f (diff) | |
| download | chromium_src-47f94e3659817effcacdc4b5699eed1f9a299a9d.zip chromium_src-47f94e3659817effcacdc4b5699eed1f9a299a9d.tar.gz chromium_src-47f94e3659817effcacdc4b5699eed1f9a299a9d.tar.bz2 | |
try to fix mac build
Review URL: http://codereview.chromium.org/21035
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9128 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/chrome.xcodeproj/project.pbxproj | 4 | ||||
| -rw-r--r-- | chrome/common/resource_bundle.h | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/chrome/chrome.xcodeproj/project.pbxproj b/chrome/chrome.xcodeproj/project.pbxproj index 82dbf46..9be3cd6 100644 --- a/chrome/chrome.xcodeproj/project.pbxproj +++ b/chrome/chrome.xcodeproj/project.pbxproj @@ -253,7 +253,6 @@ B562E2FC0F05845100FB1A4F /* property_bag_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = B562E2F40F05843C00FB1A4F /* property_bag_unittest.cc */; }; B56E281B0F057F2800447108 /* message_router.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BFBD10E9D4C9F009A6919 /* message_router.cc */; }; B5DBEA900EFC60E200C95176 /* ipc_channel_proxy.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BFBAB0E9D4C9F009A6919 /* ipc_channel_proxy.cc */; }; - B5E98B140F0574A8000A37D6 /* render_messages.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BFBF10E9D4C9F009A6919 /* render_messages.cc */; }; B5FCDE5C0F269E9B0099BFAF /* visitedlink_master.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BF95F0E9D4839009A6919 /* visitedlink_master.cc */; }; B5FDC0580EE488E500BEC6E6 /* ipc_channel_posix.cc in Sources */ = {isa = PBXBuildFile; fileRef = B5FDC0570EE488E500BEC6E6 /* ipc_channel_posix.cc */; }; B5FDC1CA0EE48ADB00BEC6E6 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D7BFDD10E9D5295009A6919 /* CoreFoundation.framework */; }; @@ -1779,7 +1778,6 @@ 4D7BFBEE0E9D4C9F009A6919 /* process_watcher.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = process_watcher.cc; sourceTree = "<group>"; }; 4D7BFBEF0E9D4C9F009A6919 /* process_watcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = process_watcher.h; sourceTree = "<group>"; }; 4D7BFBF00E9D4C9F009A6919 /* ref_counted_util.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ref_counted_util.h; sourceTree = "<group>"; }; - 4D7BFBF10E9D4C9F009A6919 /* render_messages.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = render_messages.cc; sourceTree = "<group>"; }; 4D7BFBF20E9D4C9F009A6919 /* render_messages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = render_messages.h; sourceTree = "<group>"; }; 4D7BFBF30E9D4C9F009A6919 /* render_messages_internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = render_messages_internal.h; sourceTree = "<group>"; }; 4D7BFBF40E9D4C9F009A6919 /* resource_bundle.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = resource_bundle.cc; sourceTree = "<group>"; }; @@ -3066,7 +3064,6 @@ B562E2F50F05843C00FB1A4F /* property_bag.h */, B562E2F60F05843C00FB1A4F /* property_bag.cc */, 4D7BFBF00E9D4C9F009A6919 /* ref_counted_util.h */, - 4D7BFBF10E9D4C9F009A6919 /* render_messages.cc */, 4D7BFBF20E9D4C9F009A6919 /* render_messages.h */, 4D7BFBF30E9D4C9F009A6919 /* render_messages_internal.h */, 4D7BFBF40E9D4C9F009A6919 /* resource_bundle.cc */, @@ -4718,7 +4715,6 @@ 4D7BFC7A0E9D4D2B009A6919 /* pref_names.cc in Sources */, E45076850F1530CD003BE099 /* pref_service.cc in Sources */, B562E2F80F05843C00FB1A4F /* property_bag.cc in Sources */, - B5E98B140F0574A8000A37D6 /* render_messages.cc in Sources */, E45076A90F153619003BE099 /* resource_dispatcher.cc in Sources */, E43A78750F17A95400ABD5D1 /* sandbox_init_wrapper.cc in Sources */, E40CC5FE0F2E35A800708647 /* security_filter_peer.cc in Sources */, diff --git a/chrome/common/resource_bundle.h b/chrome/common/resource_bundle.h index 7af3ac8..54d99b2 100644 --- a/chrome/common/resource_bundle.h +++ b/chrome/common/resource_bundle.h @@ -119,6 +119,9 @@ class ResourceBundle { #elif defined(OS_LINUX) // Linux will use base::DataPack. TODO(evanm): finish this. typedef base::DataPack* DataHandle; +#elif defined(OS_MACOSX) + // TODO(port): figure this out + typedef void* DataHandle; #endif // Ctor/dtor are private, since we're a singleton. |