Python.h: Don't attempt to redefine NDEBUG if it's already defined.

Others:  Remove redundant includes of assert.h.

diff --git a/Include/Python.h b/Include/Python.h
index 334116c4a91b9752a2b7a936844dc9c11f1ff47d..5d9112592d68a1adc26ff3e3b6e3c12ad91923ae 100644 (file)
--- a/Include/Python.h
+++ b/Include/Python.h
@@ -51,8 +51,10 @@
 #endif
 
 #ifndef Py_DEBUG
+#ifndef NDEBUG
 #define NDEBUG 1
 #endif
+#endif
 #include <assert.h>
 
 #include "pyport.h"

diff --git a/Modules/mpzmodule.c b/Modules/mpzmodule.c
index d4a7370c67813bf8f7a1ef13c6195595c57dbe09..bcbd238cfa44b50f09e3d7d1e5fdc053fd45e988 100644 (file)
--- a/Modules/mpzmodule.c
+++ b/Modules/mpzmodule.c
@@ -12,7 +12,6 @@
 
 #include "Python.h"
 
-#include <assert.h>
 #include <sys/types.h>         /* For size_t */
 
 /*

diff --git a/Modules/regexpr.c b/Modules/regexpr.c
index 8694c743b3a46e72ce48e7be449997886dfb9bd2..8fe1321f2a590192913be9b3953051b30e1bd5bc 100644 (file)
--- a/Modules/regexpr.c
+++ b/Modules/regexpr.c
@@ -30,7 +30,6 @@
 
 #include "Python.h"
 #include "regexpr.h"
-#include <assert.h>
 
 /* The original code blithely assumed that sizeof(short) == 2.  Not
  * always true.  Original instances of "(short)x" were replaced by

diff --git a/Objects/longobject.c b/Objects/longobject.c
index 6e337d032cdbca32abbe4f4012ecfe45bfa9e6fe..71bd1ce2e4c788ef79e46fcc8eb5ba0168f5fca3 100644 (file)
--- a/Objects/longobject.c
+++ b/Objects/longobject.c
@@ -6,7 +6,6 @@
 #include "Python.h"
 #include "longintrepr.h"
 
-#include <assert.h>
 #include <ctype.h>
 
 #define ABS(x) ((x) < 0 ? -(x) : (x))

diff --git a/PC/import_nt.c b/PC/import_nt.c
index 573106fd3ff2f390dcaa56fab41b7b37a0d38831..58cd9e4850647a7cb3b14d4627fa3ef4133e3918 100644 (file)
--- a/PC/import_nt.c
+++ b/PC/import_nt.c
@@ -8,7 +8,6 @@
 
 #include "Python.h"
 #include "osdefs.h"
-#include <assert.h>
 #include <windows.h>
 #include "importdl.h"
 #include "malloc.h" /* for alloca */