From 71c23d447322307572fbe0ca68b61fad97e10021 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Tue, 30 Nov 2010 09:30:54 +0000
Subject: Include structseq.h in Python.h, and remove now-redundant includes in
 individual sources.

---
 Include/Python.h      | 1 +
 Misc/NEWS             | 2 ++
 Modules/_lsprof.c     | 1 -
 Modules/_struct.c     | 1 -
 Modules/grpmodule.c   | 1 -
 Modules/posixmodule.c | 1 -
 Modules/pwdmodule.c   | 1 -
 Modules/resource.c    | 1 -
 Modules/spwdmodule.c  | 1 -
 Modules/timemodule.c  | 1 -
 Objects/floatobject.c | 1 -
 Objects/longobject.c  | 1 -
 Objects/structseq.c   | 1 -
 Python/sysmodule.c    | 1 -
 14 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/Include/Python.h b/Include/Python.h
index 6ca7a58..a49753f 100644
--- a/Include/Python.h
+++ b/Include/Python.h
@@ -98,6 +98,7 @@
 #include "descrobject.h"
 #include "warnings.h"
 #include "weakrefobject.h"
+#include "structseq.h"
 
 #include "codecs.h"
 #include "pyerrors.h"
diff --git a/Misc/NEWS b/Misc/NEWS
index f39b2e2..2eb41df 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -136,6 +136,8 @@ Library
 C-API
 -----
 
+- structseq.h is now included in Python.h.
+
 - Loosen PyArg_ValidateKeywordArguments to allow dict subclasses.
 
 Tests
diff --git a/Modules/_lsprof.c b/Modules/_lsprof.c
index 1fd660b..a5630c8 100644
--- a/Modules/_lsprof.c
+++ b/Modules/_lsprof.c
@@ -1,7 +1,6 @@
 #include "Python.h"
 #include "compile.h"
 #include "frameobject.h"
-#include "structseq.h"
 #include "rotatingtree.h"
 
 #if !defined(HAVE_LONG_LONG)
diff --git a/Modules/_struct.c b/Modules/_struct.c
index f85d562..2b4341c 100644
--- a/Modules/_struct.c
+++ b/Modules/_struct.c
@@ -6,7 +6,6 @@
 #define PY_SSIZE_T_CLEAN
 
 #include "Python.h"
-#include "structseq.h"
 #include "structmember.h"
 #include <ctype.h>
 
diff --git a/Modules/grpmodule.c b/Modules/grpmodule.c
index d64c142..97a3783 100644
--- a/Modules/grpmodule.c
+++ b/Modules/grpmodule.c
@@ -2,7 +2,6 @@
 /* UNIX group file access module */
 
 #include "Python.h"
-#include "structseq.h"
 
 #include <sys/types.h>
 #include <grp.h>
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index 48dbaa5..7267eca 100644
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -28,7 +28,6 @@
 #define PY_SSIZE_T_CLEAN
 
 #include "Python.h"
-#include "structseq.h"
 
 #if defined(__VMS)
 #    include <unixio.h>
diff --git a/Modules/pwdmodule.c b/Modules/pwdmodule.c
index 4e6bd2f..1e0903a 100644
--- a/Modules/pwdmodule.c
+++ b/Modules/pwdmodule.c
@@ -2,7 +2,6 @@
 /* UNIX password file access module */
 
 #include "Python.h"
-#include "structseq.h"
 
 #include <sys/types.h>
 #include <pwd.h>
diff --git a/Modules/resource.c b/Modules/resource.c
index 450f08c..1875e48 100644
--- a/Modules/resource.c
+++ b/Modules/resource.c
@@ -1,6 +1,5 @@
 
 #include "Python.h"
-#include "structseq.h"
 #include <sys/resource.h>
 #include <sys/time.h>
 #include <string.h>
diff --git a/Modules/spwdmodule.c b/Modules/spwdmodule.c
index 96707b4..194ae19 100644
--- a/Modules/spwdmodule.c
+++ b/Modules/spwdmodule.c
@@ -4,7 +4,6 @@
 /* For info also see http://www.unixpapa.com/incnote/passwd.html */
 
 #include "Python.h"
-#include "structseq.h"
 
 #include <sys/types.h>
 #ifdef HAVE_SHADOW_H
diff --git a/Modules/timemodule.c b/Modules/timemodule.c
index 5e6cd6c..79803f4 100644
--- a/Modules/timemodule.c
+++ b/Modules/timemodule.c
@@ -2,7 +2,6 @@
 /* Time module */
 
 #include "Python.h"
-#include "structseq.h"
 #include "_time.h"
 
 #define TZNAME_ENCODING "utf-8"
diff --git a/Objects/floatobject.c b/Objects/floatobject.c
index d0173e8..4decb0b 100644
--- a/Objects/floatobject.c
+++ b/Objects/floatobject.c
@@ -5,7 +5,6 @@
    for any kind of float exception without losing portability. */
 
 #include "Python.h"
-#include "structseq.h"
 
 #include <ctype.h>
 #include <float.h>
diff --git a/Objects/longobject.c b/Objects/longobject.c
index b9ce388..e8a7284 100644
--- a/Objects/longobject.c
+++ b/Objects/longobject.c
@@ -4,7 +4,6 @@
 
 #include "Python.h"
 #include "longintrepr.h"
-#include "structseq.h"
 
 #include <float.h>
 #include <ctype.h>
diff --git a/Objects/structseq.c b/Objects/structseq.c
index 52ff301..75e2250 100644
--- a/Objects/structseq.c
+++ b/Objects/structseq.c
@@ -3,7 +3,6 @@
 
 #include "Python.h"
 #include "structmember.h"
-#include "structseq.h"
 
 static char visible_length_key[] = "n_sequence_fields";
 static char real_length_key[] = "n_fields";
diff --git a/Python/sysmodule.c b/Python/sysmodule.c
index 876e31e..1aa4271 100644
--- a/Python/sysmodule.c
+++ b/Python/sysmodule.c
@@ -15,7 +15,6 @@ Data members:
 */
 
 #include "Python.h"
-#include "structseq.h"
 #include "code.h"
 #include "frameobject.h"
 #include "eval.h"
-- 
cgit v0.12