Support for long integers

diff --git a/Modules/cgensupport.c b/Modules/cgensupport.c
index 8d20f020bcc65649881b20cea50798f5dd6d4573..9a33eb96eac7acd7b69ade9e50c2202d371cf8ab 100644 (file)
--- a/Modules/cgensupport.c
+++ b/Modules/cgensupport.c
@@ -24,21 +24,8 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 /* Functions used by cgen output */
 
-#include <stdio.h>
-
-#include "PROTO.h"
-#include "object.h"
-#include "intobject.h"
-#include "floatobject.h"
-#include "stringobject.h"
-#include "tupleobject.h"
-#include "listobject.h"
-#include "methodobject.h"
-#include "moduleobject.h"
-#include "modsupport.h"
-#include "import.h"
+#include "allobjects.h"
 #include "cgensupport.h"
-#include "errors.h"
 
 
 /* Functions to construct return values */
@@ -130,6 +117,10 @@ extractdouble(v, p_arg)
                *p_arg = GETINTVALUE((intobject *)v);
                return 1;
        }
+       else if (is_longobject(v)) {
+               *p_arg = dgetlongvalue(v);
+               return 1;
+       }
        return err_badarg();
 }
 
@@ -149,6 +140,10 @@ extractfloat(v, p_arg)
                *p_arg = GETINTVALUE((intobject *)v);
                return 1;
        }
+       else if (is_longobject(v)) {
+               *p_arg = dgetlongvalue(v);
+               return 1;
+       }
        return err_badarg();
 }
 

diff --git a/Python/cgensupport.c b/Python/cgensupport.c
index 8d20f020bcc65649881b20cea50798f5dd6d4573..9a33eb96eac7acd7b69ade9e50c2202d371cf8ab 100644 (file)
--- a/Python/cgensupport.c
+++ b/Python/cgensupport.c
@@ -24,21 +24,8 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 /* Functions used by cgen output */
 
-#include <stdio.h>
-
-#include "PROTO.h"
-#include "object.h"
-#include "intobject.h"
-#include "floatobject.h"
-#include "stringobject.h"
-#include "tupleobject.h"
-#include "listobject.h"
-#include "methodobject.h"
-#include "moduleobject.h"
-#include "modsupport.h"
-#include "import.h"
+#include "allobjects.h"
 #include "cgensupport.h"
-#include "errors.h"
 
 
 /* Functions to construct return values */
@@ -130,6 +117,10 @@ extractdouble(v, p_arg)
                *p_arg = GETINTVALUE((intobject *)v);
                return 1;
        }
+       else if (is_longobject(v)) {
+               *p_arg = dgetlongvalue(v);
+               return 1;
+       }
        return err_badarg();
 }
 
@@ -149,6 +140,10 @@ extractfloat(v, p_arg)
                *p_arg = GETINTVALUE((intobject *)v);
                return 1;
        }
+       else if (is_longobject(v)) {
+               *p_arg = dgetlongvalue(v);
+               return 1;
+       }
        return err_badarg();
 }