Changeset 391 for python/trunk/Modules/expat/xmltok_ns.c

Timestamp:

Mar 19, 2014, 11:31:01 PM (11 years ago)

Author:

dmik

Message:

python: Merge vendor 2.7.6 to trunk.

Location:

python/trunk

Files:

• . (modified) (1 prop)
• Modules/expat/xmltok_ns.c (modified) (2 diffs)

python/trunk/Modules/expat/xmltok_ns.c

@@ +1 @@
+/* Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
+   See the file COPYING for copying permission.
+*/
+
+/* This file is included! */
+#ifdef XML_TOK_NS_C
+
 const ENCODING *
 NS(XmlGetUtf8InternalEncoding)(void)
@@ -105 +112 @@
                         standalone);
 }
+
+#endif /* XML_TOK_NS_C */