summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>1995-01-04 19:06:22 +0000
committerGuido van Rossum <guido@python.org>1995-01-04 19:06:22 +0000
commit2fa4d7d74644ce3cf4fc384e95609b5fc5644ee2 (patch)
tree05d7cd8fb2f86e3c12fea6a8d8169e72dd207d47
parent3687e1d08f90e27deeb1c2ebde811048081ecd9e (diff)
downloadcpython-2fa4d7d74644ce3cf4fc384e95609b5fc5644ee2.tar.gz
Added 1995 copyright.
object.h: made sizes and refcnts signed ints. stringobject.h: make getstrsize() signed int. methodobject.h: add METH_VARARGS and METH_FREENAME flag bit definitions.
-rw-r--r--Include/accessobject.h4
-rw-r--r--Include/allobjects.h4
-rw-r--r--Include/assert.h4
-rw-r--r--Include/bitset.h4
-rw-r--r--Include/bltinmodule.h4
-rw-r--r--Include/ceval.h4
-rw-r--r--Include/cgensupport.h4
-rw-r--r--Include/classobject.h4
-rw-r--r--Include/compile.h4
-rw-r--r--Include/dictobject.h4
-rw-r--r--Include/errcode.h4
-rwxr-xr-xInclude/errors.h4
-rw-r--r--Include/eval.h4
-rw-r--r--Include/fileobject.h4
-rw-r--r--Include/floatobject.h4
-rw-r--r--Include/frameobject.h4
-rw-r--r--Include/funcobject.h4
-rw-r--r--Include/grammar.h4
-rw-r--r--Include/import.h4
-rw-r--r--Include/intobject.h4
-rw-r--r--Include/intrcheck.h4
-rw-r--r--Include/listobject.h4
-rw-r--r--Include/longintrepr.h4
-rw-r--r--Include/longobject.h4
-rw-r--r--Include/mappingobject.h4
-rw-r--r--Include/marshal.h4
-rw-r--r--Include/metagrammar.h4
-rw-r--r--Include/methodobject.h8
-rw-r--r--Include/modsupport.h4
-rw-r--r--Include/moduleobject.h4
-rw-r--r--Include/mymalloc.h4
-rw-r--r--Include/myproto.h4
-rw-r--r--Include/myselect.h4
-rw-r--r--Include/mytime.h4
-rw-r--r--Include/node.h4
-rw-r--r--Include/object.h14
-rw-r--r--Include/objimpl.h4
-rw-r--r--Include/opcode.h4
-rw-r--r--Include/osdefs.h4
-rw-r--r--Include/parsetok.h4
-rw-r--r--Include/pgenheaders.h4
-rw-r--r--Include/pyerrors.h4
-rw-r--r--Include/pythonrun.h4
-rw-r--r--Include/rangeobject.h4
-rwxr-xr-xInclude/rename1.h4
-rw-r--r--Include/stringobject.h6
-rw-r--r--Include/structmember.h4
-rw-r--r--Include/sysmodule.h4
-rw-r--r--Include/token.h4
-rw-r--r--Include/traceback.h4
-rw-r--r--Include/tupleobject.h4
-rw-r--r--Modules/cgensupport.h4
-rw-r--r--Parser/assert.h4
53 files changed, 116 insertions, 112 deletions
diff --git a/Include/accessobject.h b/Include/accessobject.h
index 56193087b8..975b0f061e 100644
--- a/Include/accessobject.h
+++ b/Include/accessobject.h
@@ -5,8 +5,8 @@ extern "C" {
#endif
/***********************************************************
-Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
-Amsterdam, The Netherlands.
+Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
+The Netherlands.
All Rights Reserved
diff --git a/Include/allobjects.h b/Include/allobjects.h
index d3cec8947e..363d9a1e86 100644
--- a/Include/allobjects.h
+++ b/Include/allobjects.h
@@ -5,8 +5,8 @@ extern "C" {
#endif
/***********************************************************
-Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
-Amsterdam, The Netherlands.
+Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
+The Netherlands.
All Rights Reserved
diff --git a/Include/assert.h b/Include/assert.h
index d007eca26a..b0c08abee2 100644
--- a/Include/assert.h
+++ b/Include/assert.h
@@ -5,8 +5,8 @@ extern "C" {
#endif
/***********************************************************
-Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
-Amsterdam, The Netherlands.
+Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
+The Netherlands.
All Rights Reserved
diff --git a/Include/bitset.h b/Include/bitset.h
index 9be259a297..f1a1ead348 100644
--- a/Include/bitset.h
+++ b/Include/bitset.h
@@ -5,8 +5,8 @@ extern "C" {
#endif
/***********************************************************
-Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
-Amsterdam, The Netherlands.
+Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
+The Netherlands.
All Rights Reserved
diff --git a/Include/bltinmodule.h b/Include/bltinmodule.h
index d000aaaa6f..c94cf636d7 100644
--- a/Include/bltinmodule.h
+++ b/Include/bltinmodule.h
@@ -5,8 +5,8 @@ extern "C" {
#endif
/***********************************************************
-Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
-Amsterdam, The Netherlands.
+Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
+The Netherlands.
All Rights Reserved
diff --git a/Include/ceval.h b/Include/ceval.h
index 8de2fc04ce..796b11aca2 100644
--- a/Include/ceval.h
+++ b/Include/ceval.h
@@ -5,8 +5,8 @@ extern "C" {
#endif
/***********************************************************
-Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
-Amsterdam, The Netherlands.
+Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
+The Netherlands.
All Rights Reserved
diff --git a/Include/cgensupport.h b/Include/cgensupport.h
index 4b295b30aa..fe02da2248 100644
--- a/Include/cgensupport.h
+++ b/Include/cgensupport.h
@@ -5,8 +5,8 @@ extern "C" {
#endif
/***********************************************************
-Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
-Amsterdam, The Netherlands.
+Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
+The Netherlands.
All Rights Reserved
diff --git a/Include/classobject.h b/Include/classobject.h
index 227c9141f2..ec57cdb511 100644
--- a/Include/classobject.h
+++ b/Include/classobject.h
@@ -5,8 +5,8 @@ extern "C" {
#endif
/***********************************************************
-Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
-Amsterdam, The Netherlands.
+Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
+The Netherlands.
All Rights Reserved
diff --git a/Include/compile.h b/Include/compile.h
index 6c782da9a4..d2b6ed5960 100644
--- a/Include/compile.h
+++ b/Include/compile.h
@@ -5,8 +5,8 @@ extern "C" {
#endif
/***********************************************************
-Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
-Amsterdam, The Netherlands.
+Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
+The Netherlands.
All Rights Reserved
diff --git a/Include/dictobject.h b/Include/dictobject.h
index 4afed79c4b..e03435bba1 100644
--- a/Include/dictobject.h
+++ b/Include/dictobject.h
@@ -5,8 +5,8 @@ extern "C" {
#endif
/***********************************************************
-Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
-Amsterdam, The Netherlands.
+Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
+The Netherlands.
All Rights Reserved
diff --git a/Include/errcode.h b/Include/errcode.h
index e8db943df6..7ed50a59d7 100644
--- a/Include/errcode.h
+++ b/Include/errcode.h
@@ -5,8 +5,8 @@ extern "C" {
#endif
/***********************************************************
-Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
-Amsterdam, The Netherlands.
+Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
+The Netherlands.
All Rights Reserved
diff --git a/Include/errors.h b/Include/errors.h
index ff545bf5b8..69d27729e4 100755
--- a/Include/errors.h
+++ b/Include/errors.h
@@ -5,8 +5,8 @@ extern "C" {
#endif
/***********************************************************
-Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
-Amsterdam, The Netherlands.
+Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
+The Netherlands.
All Rights Reserved
diff --git a/Include/eval.h b/Include/eval.h
index ed33d448fa..3fd9c463a4 100644
--- a/Include/eval.h
+++ b/Include/eval.h
@@ -5,8 +5,8 @@ extern "C" {
#endif
/***********************************************************
-Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
-Amsterdam, The Netherlands.
+Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
+The Netherlands.
All Rights Reserved
diff --git a/Include/fileobject.h b/Include/fileobject.h
index 7cdd63a067..f3dad7beb1 100644
--- a/Include/fileobject.h
+++ b/Include/fileobject.h
@@ -5,8 +5,8 @@ extern "C" {
#endif
/***********************************************************
-Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
-Amsterdam, The Netherlands.
+Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
+The Netherlands.
All Rights Reserved
diff --git a/Include/floatobject.h b/Include/floatobject.h
index f6999bd236..5e5a2f0218 100644
--- a/Include/floatobject.h
+++ b/Include/floatobject.h
@@ -5,8 +5,8 @@ extern "C" {
#endif
/***********************************************************
-Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
-Amsterdam, The Netherlands.
+Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
+The Netherlands.
All Rights Reserved
diff --git a/Include/frameobject.h b/Include/frameobject.h
index d9b375a1a8..f8ad710918 100644
--- a/Include/frameobject.h
+++ b/Include/frameobject.h
@@ -5,8 +5,8 @@ extern "C" {
#endif
/***********************************************************
-Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
-Amsterdam, The Netherlands.
+Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
+The Netherlands.
All Rights Reserved
diff --git a/Include/funcobject.h b/Include/funcobject.h
index cb36518db5..9801505e67 100644
--- a/Include/funcobject.h
+++ b/Include/funcobject.h
@@ -5,8 +5,8 @@ extern "C" {
#endif
/***********************************************************
-Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
-Amsterdam, The Netherlands.
+Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
+The Netherlands.
All Rights Reserved
diff --git a/Include/grammar.h b/Include/grammar.h
index f2e008f9e0..2d3f88dd9b 100644
--- a/Include/grammar.h
+++ b/Include/grammar.h
@@ -5,8 +5,8 @@ extern "C" {
#endif
/***********************************************************
-Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
-Amsterdam, The Netherlands.
+Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
+The Netherlands.
All Rights Reserved
diff --git a/Include/import.h b/Include/import.h
index 02c8ebff23..7699bc6250 100644
--- a/Include/import.h
+++ b/Include/import.h
@@ -5,8 +5,8 @@ extern "C" {
#endif
/***********************************************************
-Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
-Amsterdam, The Netherlands.
+Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
+The Netherlands.
All Rights Reserved
diff --git a/Include/intobject.h b/Include/intobject.h
index 28471b54ed..91d4c096f7 100644
--- a/Include/intobject.h
+++ b/Include/intobject.h
@@ -5,8 +5,8 @@ extern "C" {
#endif
/***********************************************************
-Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
-Amsterdam, The Netherlands.
+Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
+The Netherlands.
All Rights Reserved
diff --git a/Include/intrcheck.h b/Include/intrcheck.h
index 2914a6ae1d..8f22700812 100644
--- a/Include/intrcheck.h
+++ b/Include/intrcheck.h
@@ -5,8 +5,8 @@ extern "C" {
#endif
/***********************************************************
-Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
-Amsterdam, The Netherlands.
+Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
+The Netherlands.
All Rights Reserved
diff --git a/Include/listobject.h b/Include/listobject.h
index 212e3ce96e..f14286ec43 100644
--- a/Include/listobject.h
+++ b/Include/listobject.h
@@ -5,8 +5,8 @@ extern "C" {
#endif
/***********************************************************
-Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
-Amsterdam, The Netherlands.
+Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
+The Netherlands.
All Rights Reserved
diff --git a/Include/longintrepr.h b/Include/longintrepr.h
index b8d279de97..7ed12d29e1 100644
--- a/Include/longintrepr.h
+++ b/Include/longintrepr.h
@@ -5,8 +5,8 @@ extern "C" {
#endif
/***********************************************************
-Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
-Amsterdam, The Netherlands.
+Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
+The Netherlands.
All Rights Reserved
diff --git a/Include/longobject.h b/Include/longobject.h
index 4c21e7a665..83daa34731 100644
--- a/Include/longobject.h
+++ b/Include/longobject.h
@@ -5,8 +5,8 @@ extern "C" {
#endif
/***********************************************************
-Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
-Amsterdam, The Netherlands.
+Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
+The Netherlands.
All Rights Reserved
diff --git a/Include/mappingobject.h b/Include/mappingobject.h
index caedbc7549..5422e9820e 100644
--- a/Include/mappingobject.h
+++ b/Include/mappingobject.h
@@ -5,8 +5,8 @@ extern "C" {
#endif
/***********************************************************
-Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
-Amsterdam, The Netherlands.
+Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
+The Netherlands.
All Rights Reserved
diff --git a/Include/marshal.h b/Include/marshal.h
index e086e84e4f..ff829c30ec 100644
--- a/Include/marshal.h
+++ b/Include/marshal.h
@@ -5,8 +5,8 @@ extern "C" {
#endif
/***********************************************************
-Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
-Amsterdam, The Netherlands.
+Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
+The Netherlands.
All Rights Reserved
diff --git a/Include/metagrammar.h b/Include/metagrammar.h
index 8248aed03d..4d386a2196 100644
--- a/Include/metagrammar.h
+++ b/Include/metagrammar.h
@@ -5,8 +5,8 @@ extern "C" {
#endif
/***********************************************************
-Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
-Amsterdam, The Netherlands.
+Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
+The Netherlands.
All Rights Reserved
diff --git a/Include/methodobject.h b/Include/methodobject.h
index 5799a18590..178bdfb134 100644
--- a/Include/methodobject.h
+++ b/Include/methodobject.h
@@ -5,8 +5,8 @@ extern "C" {
#endif
/***********************************************************
-Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
-Amsterdam, The Netherlands.
+Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
+The Netherlands.
All Rights Reserved
@@ -49,6 +49,10 @@ struct methodlist {
extern object *findmethod PROTO((struct methodlist *, object *, char *));
+/* Flag passed to newmethodobject */
+#define METH_VARARGS 0x0001
+#define METH_FREENAME 0x0100
+
#ifdef __cplusplus
}
#endif
diff --git a/Include/modsupport.h b/Include/modsupport.h
index 69378cdbfc..9fe8763e5b 100644
--- a/Include/modsupport.h
+++ b/Include/modsupport.h
@@ -5,8 +5,8 @@ extern "C" {
#endif
/***********************************************************
-Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
-Amsterdam, The Netherlands.
+Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
+The Netherlands.
All Rights Reserved
diff --git a/Include/moduleobject.h b/Include/moduleobject.h
index 3bd2642729..c9dc96dc8b 100644
--- a/Include/moduleobject.h
+++ b/Include/moduleobject.h
@@ -5,8 +5,8 @@ extern "C" {
#endif
/***********************************************************
-Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
-Amsterdam, The Netherlands.
+Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
+The Netherlands.
All Rights Reserved
diff --git a/Include/mymalloc.h b/Include/mymalloc.h
index ea676c3cf1..877bcb9897 100644
--- a/Include/mymalloc.h
+++ b/Include/mymalloc.h
@@ -5,8 +5,8 @@ extern "C" {
#endif
/***********************************************************
-Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
-Amsterdam, The Netherlands.
+Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
+The Netherlands.
All Rights Reserved
diff --git a/Include/myproto.h b/Include/myproto.h
index 686275506b..e60d2cc78b 100644
--- a/Include/myproto.h
+++ b/Include/myproto.h
@@ -5,8 +5,8 @@ extern "C" {
#endif
/***********************************************************
-Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
-Amsterdam, The Netherlands.
+Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
+The Netherlands.
All Rights Reserved
diff --git a/Include/myselect.h b/Include/myselect.h
index e4f2b289a5..ee964eb184 100644
--- a/Include/myselect.h
+++ b/Include/myselect.h
@@ -5,8 +5,8 @@ extern "C" {
#endif
/***********************************************************
-Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
-Amsterdam, The Netherlands.
+Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
+The Netherlands.
All Rights Reserved
diff --git a/Include/mytime.h b/Include/mytime.h
index e175d5aedf..bdd939efd0 100644
--- a/Include/mytime.h
+++ b/Include/mytime.h
@@ -5,8 +5,8 @@ extern "C" {
#endif
/***********************************************************
-Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
-Amsterdam, The Netherlands.
+Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
+The Netherlands.
All Rights Reserved
diff --git a/Include/node.h b/Include/node.h
index a2a2212b4b..f98d7fcea7 100644
--- a/Include/node.h
+++ b/Include/node.h
@@ -5,8 +5,8 @@ extern "C" {
#endif
/***********************************************************
-Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
-Amsterdam, The Netherlands.
+Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
+The Netherlands.
All Rights Reserved
diff --git a/Include/object.h b/Include/object.h
index e4195674c9..433876feaf 100644
--- a/Include/object.h
+++ b/Include/object.h
@@ -5,8 +5,8 @@ extern "C" {
#endif
/***********************************************************
-Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
-Amsterdam, The Netherlands.
+Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
+The Netherlands.
All Rights Reserved
@@ -99,14 +99,14 @@ whose size is determined when the object is allocated.
#define OB_HEAD_INIT(type) 0, 0, 1, type,
#else
#define OB_HEAD \
- unsigned int ob_refcnt; \
+ int ob_refcnt; \
struct _typeobject *ob_type;
#define OB_HEAD_INIT(type) 1, type,
#endif
#define OB_VARHEAD \
OB_HEAD \
- unsigned int ob_size; /* Number of items in variable part */
+ int ob_size; /* Number of items in variable part */
typedef struct _object {
OB_HEAD
@@ -197,7 +197,7 @@ typedef long (*hashfunc) PROTO((object *));
typedef struct _typeobject {
OB_VARHEAD
char *tp_name; /* For printing */
- unsigned int tp_basicsize, tp_itemsize; /* For allocation */
+ int tp_basicsize, tp_itemsize; /* For allocation */
/* Methods to implement standard operations */
@@ -304,7 +304,7 @@ extern long ref_total;
#endif
#define INCREF(op) (ref_total++, (op)->ob_refcnt++)
#define DECREF(op) \
- if (--ref_total, --(op)->ob_refcnt > 0) \
+ if (--ref_total, --(op)->ob_refcnt != 0) \
; \
else \
DELREF(op)
@@ -316,7 +316,7 @@ extern long ref_total;
#endif
#define INCREF(op) ((op)->ob_refcnt++)
#define DECREF(op) \
- if (--(op)->ob_refcnt > 0) \
+ if (--(op)->ob_refcnt != 0) \
; \
else \
DELREF(op)
diff --git a/Include/objimpl.h b/Include/objimpl.h
index c904cf8c42..a8ce3cb0ed 100644
--- a/Include/objimpl.h
+++ b/Include/objimpl.h
@@ -5,8 +5,8 @@ extern "C" {
#endif
/***********************************************************
-Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
-Amsterdam, The Netherlands.
+Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
+The Netherlands.
All Rights Reserved
diff --git a/Include/opcode.h b/Include/opcode.h
index b6a42ccf9d..65fe1bb2af 100644
--- a/Include/opcode.h
+++ b/Include/opcode.h
@@ -5,8 +5,8 @@ extern "C" {
#endif
/***********************************************************
-Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
-Amsterdam, The Netherlands.
+Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
+The Netherlands.
All Rights Reserved
diff --git a/Include/osdefs.h b/Include/osdefs.h
index fd05298d8c..25c9c362ac 100644
--- a/Include/osdefs.h
+++ b/Include/osdefs.h
@@ -5,8 +5,8 @@ extern "C" {
#endif
/***********************************************************
-Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
-Amsterdam, The Netherlands.
+Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
+The Netherlands.
All Rights Reserved
diff --git a/Include/parsetok.h b/Include/parsetok.h
index b27cf4ec91..a568f46424 100644
--- a/Include/parsetok.h
+++ b/Include/parsetok.h
@@ -5,8 +5,8 @@ extern "C" {
#endif
/***********************************************************
-Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
-Amsterdam, The Netherlands.
+Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
+The Netherlands.
All Rights Reserved
diff --git a/Include/pgenheaders.h b/Include/pgenheaders.h
index adfae6850c..2f1bf50030 100644
--- a/Include/pgenheaders.h
+++ b/Include/pgenheaders.h
@@ -5,8 +5,8 @@ extern "C" {
#endif
/***********************************************************
-Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
-Amsterdam, The Netherlands.
+Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
+The Netherlands.
All Rights Reserved
diff --git a/Include/pyerrors.h b/Include/pyerrors.h
index ff545bf5b8..69d27729e4 100644
--- a/Include/pyerrors.h
+++ b/Include/pyerrors.h
@@ -5,8 +5,8 @@ extern "C" {
#endif
/***********************************************************
-Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
-Amsterdam, The Netherlands.
+Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
+The Netherlands.
All Rights Reserved
diff --git a/Include/pythonrun.h b/Include/pythonrun.h
index 0ac9fb5b0a..f59e54e86d 100644
--- a/Include/pythonrun.h
+++ b/Include/pythonrun.h
@@ -5,8 +5,8 @@ extern "C" {
#endif
/***********************************************************
-Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
-Amsterdam, The Netherlands.
+Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
+The Netherlands.
All Rights Reserved
diff --git a/Include/rangeobject.h b/Include/rangeobject.h
index 50d660b213..d35f1fd60c 100644
--- a/Include/rangeobject.h
+++ b/Include/rangeobject.h
@@ -1,6 +1,6 @@
/***********************************************************
-Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
-Amsterdam, The Netherlands.
+Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
+The Netherlands.
All Rights Reserved
diff --git a/Include/rename1.h b/Include/rename1.h
index f271c44b10..2ae9326e95 100755
--- a/Include/rename1.h
+++ b/Include/rename1.h
@@ -5,8 +5,8 @@ extern "C" {
#endif
/***********************************************************
-Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
-Amsterdam, The Netherlands.
+Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
+The Netherlands.
All Rights Reserved
diff --git a/Include/stringobject.h b/Include/stringobject.h
index b6ec1c8ca3..67bb57ba1b 100644
--- a/Include/stringobject.h
+++ b/Include/stringobject.h
@@ -5,8 +5,8 @@ extern "C" {
#endif
/***********************************************************
-Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
-Amsterdam, The Netherlands.
+Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
+The Netherlands.
All Rights Reserved
@@ -63,7 +63,7 @@ extern DL_IMPORT typeobject Stringtype;
extern object *newsizedstringobject PROTO((char *, int));
extern object *newstringobject PROTO((char *));
-extern unsigned int getstringsize PROTO((object *));
+extern int getstringsize PROTO((object *));
extern char *getstringvalue PROTO((object *));
extern void joinstring PROTO((object **, object *));
extern void joinstring_decref PROTO((object **, object *));
diff --git a/Include/structmember.h b/Include/structmember.h
index 2e9bd0d2db..50589faaba 100644
--- a/Include/structmember.h
+++ b/Include/structmember.h
@@ -5,8 +5,8 @@ extern "C" {
#endif
/***********************************************************
-Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
-Amsterdam, The Netherlands.
+Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
+The Netherlands.
All Rights Reserved
diff --git a/Include/sysmodule.h b/Include/sysmodule.h
index e48e4a32e7..46d0070d66 100644
--- a/Include/sysmodule.h
+++ b/Include/sysmodule.h
@@ -5,8 +5,8 @@ extern "C" {
#endif
/***********************************************************
-Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
-Amsterdam, The Netherlands.
+Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
+The Netherlands.
All Rights Reserved
diff --git a/Include/token.h b/Include/token.h
index 9281773334..0e138fc7cf 100644
--- a/Include/token.h
+++ b/Include/token.h
@@ -5,8 +5,8 @@ extern "C" {
#endif
/***********************************************************
-Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
-Amsterdam, The Netherlands.
+Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
+The Netherlands.
All Rights Reserved
diff --git a/Include/traceback.h b/Include/traceback.h
index a1b6d5eab8..bc9422b206 100644
--- a/Include/traceback.h
+++ b/Include/traceback.h
@@ -5,8 +5,8 @@ extern "C" {
#endif
/***********************************************************
-Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
-Amsterdam, The Netherlands.
+Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
+The Netherlands.
All Rights Reserved
diff --git a/Include/tupleobject.h b/Include/tupleobject.h
index f89c655b2f..b57c0174a3 100644
--- a/Include/tupleobject.h
+++ b/Include/tupleobject.h
@@ -5,8 +5,8 @@ extern "C" {
#endif
/***********************************************************
-Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
-Amsterdam, The Netherlands.
+Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
+The Netherlands.
All Rights Reserved
diff --git a/Modules/cgensupport.h b/Modules/cgensupport.h
index 4b295b30aa..fe02da2248 100644
--- a/Modules/cgensupport.h
+++ b/Modules/cgensupport.h
@@ -5,8 +5,8 @@ extern "C" {
#endif
/***********************************************************
-Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
-Amsterdam, The Netherlands.
+Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
+The Netherlands.
All Rights Reserved
diff --git a/Parser/assert.h b/Parser/assert.h
index d007eca26a..b0c08abee2 100644
--- a/Parser/assert.h
+++ b/Parser/assert.h
@@ -5,8 +5,8 @@ extern "C" {
#endif
/***********************************************************
-Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
-Amsterdam, The Netherlands.
+Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
+The Netherlands.
All Rights Reserved