summaryrefslogtreecommitdiffstats
path: root/Mac
diff options
context:
space:
mode:
authorJack Jansen <jack.jansen@cwi.nl>2002-09-10 12:32:47 (GMT)
committerJack Jansen <jack.jansen@cwi.nl>2002-09-10 12:32:47 (GMT)
commit47ec1419639b1aa1817860b301c81868284336d1 (patch)
tree450b5f361f53d0146425411f1d2f2a7f00d9b0f9 /Mac
parent2575022aeff348596c34e0caa028ea8c166cbff6 (diff)
downloadcpython-47ec1419639b1aa1817860b301c81868284336d1.zip
cpython-47ec1419639b1aa1817860b301c81868284336d1.tar.gz
cpython-47ec1419639b1aa1817860b301c81868284336d1.tar.bz2
Added include guards and C++ extern "C" {} constructs. Partial fix for #607253.
Bugfix candidate.
Diffstat (limited to 'Mac')
-rw-r--r--Mac/Include/getapplbycreator.h11
-rw-r--r--Mac/Include/macdefs.h11
-rw-r--r--Mac/Include/macglue.h4
-rw-r--r--Mac/Include/pythonresources.h12
4 files changed, 37 insertions, 1 deletions
diff --git a/Mac/Include/getapplbycreator.h b/Mac/Include/getapplbycreator.h
index 62e5930..535be16 100644
--- a/Mac/Include/getapplbycreator.h
+++ b/Mac/Include/getapplbycreator.h
@@ -21,6 +21,8 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
******************************************************************/
+#ifndef Py_GETAPPLBYCREATOR_H
+#define Py_GETALLPBYCREATOR_H
#ifdef WITHOUT_FRAMEWORKS
#include <Types.h>
@@ -29,4 +31,13 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <Carbon/Carbon.h>
#endif
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
extern OSErr FindApplicationFromCreator(OSType, FSSpecPtr);
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/Mac/Include/macdefs.h b/Mac/Include/macdefs.h
index 409c253..df7d6f7 100644
--- a/Mac/Include/macdefs.h
+++ b/Mac/Include/macdefs.h
@@ -2,6 +2,8 @@
look-alike file system access functions on the Macintosh.
Public domain by Guido van Rossum, CWI, Amsterdam (July 1987).
*/
+#ifndef Py_MACDEFS_H
+#define Py_MACDEFS_H
#include <Types.h>
#include <Files.h>
@@ -14,6 +16,10 @@
#include <TextUtils.h>
#endif
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
/* We may be able to use a std routine in think, don't know */
extern unsigned char *Pstring(char *);
extern char *getbootvol(void);
@@ -33,3 +39,8 @@ extern int sync(void);
#endif
#define EOS '\0'
#define SEP ':'
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/Mac/Include/macglue.h b/Mac/Include/macglue.h
index 3e57cd4..170de35 100644
--- a/Mac/Include/macglue.h
+++ b/Mac/Include/macglue.h
@@ -21,7 +21,8 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
******************************************************************/
-
+#ifndef Py_MACGLUE_H
+#define Py_MACGLUE_H
#ifdef WITHOUT_FRAMEWORKS
#include <Types.h>
#include <Files.h>
@@ -137,3 +138,4 @@ long PyMac_DummyWriteHandler(char *, long);
#ifdef __cplusplus
}
#endif
+#endif
diff --git a/Mac/Include/pythonresources.h b/Mac/Include/pythonresources.h
index 01c96ff..8dfe9ad 100644
--- a/Mac/Include/pythonresources.h
+++ b/Mac/Include/pythonresources.h
@@ -40,6 +40,12 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
** Resources that reside in the python executable (or, for
** shared ppc python, in the core dynamic library)
*/
+#ifndef Py_PYTHONRESOURCES_H
+#define Py_PYTHONRESOURCES_H
+
+#ifdef __cplusplus
+ extern "C" {
+#endif
#define BASE_ID 228
@@ -181,3 +187,9 @@ char * PyMac_GetPythonDir(void);
/* from macmain.c: */
extern PyMac_PrefRecord PyMac_options;
#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif