summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorStefan Krah <skrah@bytereef.org>2012-09-30 15:21:49 (GMT)
committerStefan Krah <skrah@bytereef.org>2012-09-30 15:21:49 (GMT)
commite65676b19439422cb3df5d87d276f0a254f8b9e7 (patch)
treec001f9cfc707227195bf8e053038632e6aa1d26f /Modules
parente04d611548ce49dfea37122d564aa312d1eb0473 (diff)
parente59aa8c94daf8191fcf7a4773a3fae14a5162084 (diff)
downloadcpython-e65676b19439422cb3df5d87d276f0a254f8b9e7.zip
cpython-e65676b19439422cb3df5d87d276f0a254f8b9e7.tar.gz
cpython-e65676b19439422cb3df5d87d276f0a254f8b9e7.tar.bz2
Merge 3.3.
Diffstat (limited to 'Modules')
-rw-r--r--Modules/_decimal/libmpdec/mpdecimal.h5
1 files changed, 0 insertions, 5 deletions
diff --git a/Modules/_decimal/libmpdec/mpdecimal.h b/Modules/_decimal/libmpdec/mpdecimal.h
index e014f1c..d131c71 100644
--- a/Modules/_decimal/libmpdec/mpdecimal.h
+++ b/Modules/_decimal/libmpdec/mpdecimal.h
@@ -106,11 +106,6 @@ extern "C" {
#endif
#endif
-/* ASM isn't available in strict ansi C mode */
-#if defined(ASM) && defined(__STRICT_ANSI__)
- #undef ASM
- #define ANSI
-#endif
/* BEGIN CONFIG_64 */
#if defined(CONFIG_64)