* Added support for X11 modules.

* Makefile: change location of FORMS library.
* posixmodule.c: turn #if 0 into #ifdef MSDOS (stuff in unistd.h or not)
* Almost all .h files: added CPP magic to avoid duplicate inclusions and
  to support inclusion from C++.

5 files changed, 71 insertions, 3 deletions

diff --git a/Modules/cgensupport.h b/Modules/cgensupport.h
index 43818bc..8472b03 100644
--- a/Modules/cgensupport.h
+++ b/Modules/cgensupport.h
@@ -1,3 +1,9 @@
+#ifndef Py_CGENSUPPORT_H
+#define Py_CGENSUPPORT_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /***********************************************************
 Copyright 1991, 1992, 1993 by Stichting Mathematisch Centrum,
 Amsterdam, The Netherlands.
@@ -36,3 +42,8 @@ extern int getilongarg PROTO((object *args, int nargs, int i, long *p_a));
 extern int getishortarg PROTO((object *args, int nargs, int i, short *p_a));
 extern int getifloatarg PROTO((object *args, int nargs, int i, float *p_a));
 extern int getistringarg PROTO((object *args, int nargs, int i, string *p_a));
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* !Py_CGENSUPPORT_H */
diff --git a/Modules/config.c.in b/Modules/config.c.in
index 692827e..faf36a8 100644
--- a/Modules/config.c.in
+++ b/Modules/config.c.in
@@ -295,6 +295,21 @@ extern void initmd5();
 #ifdef USE_ARRAY
 extern void initarray();
 #endif
+#ifdef USE_XT
+extern void initXt();
+#endif
+#ifdef USE_XAW
+extern void initXaw();
+#endif
+#ifdef USE_XM
+extern void initXm();
+#endif
+#ifdef USE_GLX
+extern void initGlx();
+#endif
+#ifdef USE_HTML
+extern void initHTML();
+#endif
 /* -- ADDMODULE MARKER 1 -- */
 
 struct {
@@ -450,6 +465,26 @@ struct {
        {"array", initarray},
 #endif
 
+#ifdef USE_XT
+	{"Xt", initXt},
+#endif
+
+#ifdef USE_XAW
+	{"Xaw", initXaw},
+#endif
+
+#ifdef USE_XM
+	{"Xm", initXm},
+#endif
+
+#ifdef USE_GLX
+	{"Glx", initGlx},
+#endif
+
+#ifdef USE_HTML
+	{"HTML", initHTML},
+#endif
+
 /* -- ADDMODULE MARKER 2 -- */
 
 	{0,		0}		/* Sentinel */
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index e29be40..d3f3583 100644
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -85,15 +85,15 @@ extern int chdir PROTO((const char *));
 extern int rmdir PROTO((const char *));
 extern int chmod PROTO((const char *, mode_t));
 extern char *getcwd PROTO((char *, int)); /* XXX or size_t? */
-#if 0
+#ifndef MSDOS
 extern char *strerror PROTO((int));
 extern int link PROTO((const char *, const char *));
 extern int rename PROTO((const char *, const char *));
 extern int stat PROTO((const char *, struct stat *));
 extern int unlink PROTO((const char *));
 extern int pclose PROTO((FILE *));
-#endif
-#endif /* _SEQUENT_ */
+#endif /* !MSDOS */
+#endif /* !_SEQUENT_ */
 #ifdef NO_LSTAT
 #define lstat stat
 #else
diff --git a/Modules/regexpr.h b/Modules/regexpr.h
index ef46554..7e82abd 100644
--- a/Modules/regexpr.h
+++ b/Modules/regexpr.h
@@ -1,3 +1,9 @@
+#ifndef Py_REGEXPR_H
+#define Py_REGEXPR_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /*
 
 regexpr.h
@@ -138,3 +144,8 @@ int re_exec();
 #endif /* REGEXPR_H */
 
 
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* !Py_REGEXPR_H */
diff --git a/Modules/yuv.h b/Modules/yuv.h
index 6c7b1e2..4046df6 100644
--- a/Modules/yuv.h
+++ b/Modules/yuv.h
@@ -1,3 +1,9 @@
+#ifndef Py_YUV_H
+#define Py_YUV_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /*
  * SVideo YUV 4:1:1 format.
  *
@@ -85,3 +91,8 @@ struct yuv422 {
 void yuv_sv411_to_cl422dc(int, void *, void *, int, int);
 void yuv_sv411_to_cl422dc_quartersize(int, void *, void *, int, int);
 void yuv_sv411_to_cl422dc_sixteenthsize(int, void *, void *, int, int);
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* !Py_YUV_H */