Revert the changes to libxml.gyp in r52725....

third_party/libxml/libxml.gyp

 # Copyright (c) 2009 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'conditions': [
       ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
         'os_include': 'linux'
       }],
@@ skipping 130 matching lines @@
             'xmlregexp.c',
             'xmlsave.c',
             'xmlschemas.c',
             'xmlschemastypes.c',
             'xmlstring.c',
             'xmlunicode.c',
             'xmlwriter.c',
             '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',
             'include',
           ],
           'dependencies': [
             '../icu/icu.gyp:icuuc',
             '../zlib/zlib.gyp:zlib',
           ],
           'export_dependent_settings': [
             '../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',
             ],
           },
           'conditions': [
             ['OS=="linux"', {
               'link_settings': {
                 'libraries': [
                   # We need dl for dlopen() and friends.
                   '-ldl',
                 ],
               },
             }],
             ['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',
             }],
           ],
         }],
       ],
     },
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: