Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(163)

Unified Diff: third_party/libxml/libxml.gyp

Issue 3063009: Revert the changes to libxml.gyp in r52725.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Fix macro redefined warning. Created 10 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/libxml/libxml.gyp
===================================================================
--- third_party/libxml/libxml.gyp (revision 53800)
+++ third_party/libxml/libxml.gyp (working copy)
@@ -148,6 +148,13 @@
'xpath.c',
'xpointer.c',
],
+ 'defines': [
+ # Define LIBXML_STATIC as nothing to match how libxml.h
+ # (an internal header) defines LIBXML_STATIC, otherwise
+ # we get the macro redefined warning from GCC. (-DFOO
+ # defines the macro FOO as 1.)
+ 'LIBXML_STATIC=',
+ ],
'include_dirs': [
'<(os_include)',
'<(os_include)/include',
@@ -161,6 +168,9 @@
'../icu/icu.gyp:icuuc',
],
'direct_dependent_settings': {
+ 'defines': [
+ 'LIBXML_STATIC',
Evan Martin 2010/07/27 18:22:53 Should this also be 'LIBXML_STATIC='?
+ ],
'include_dirs': [
'<(os_include)/include',
'include',
@@ -178,11 +188,6 @@
['OS=="mac"', {'defines': ['_REENTRANT']}],
['OS=="win"', {
'product_name': 'libxml2',
- 'defines': [
- # This symbol prevents libxml from marking its functions with
- # __declspec(dllexport).
- 'LIBXML_STATIC',
- ],
}, { # else: OS!="win"
'product_name': 'xml2',
}],
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698