Changeset 10 for python/trunk/Include

Timestamp:

Sep 3, 2010, 5:33:06 PM (15 years ago)

Author:

Yuri Dario

Message:

python: merged offline changes.

Location:

python/trunk/Include

Files:

• osdefs.h (modified) (2 diffs)
• pyport.h (modified) (3 diffs)

python/trunk/Include/osdefs.h

@@ -20 +20 @@
 #define MAXPATHLEN 256
 #endif
+#define DRVSEP ':' /* (bird) */
 #define DELIM ';'
 #endif
@@ -34 +35 @@
 #ifndef SEP
 #define SEP '/'
+#endif
+
+/* Test if `ch' is a filename separator (bird) */
+#ifdef ALTSEP
+#define IS_SEP(ch) ((ch) == SEP || (ch) == ALTSEP)
+#else
+#define IS_SEP(ch) ((ch) == SEP)
+#endif
+
+/* Test if `path' has a drive letter or not. (bird) */
+#ifdef DRVSEP
+#define HAS_DRV(path) (*(path) && (path)[1] == DRVSEP)
+#else
+#define HAS_DRV(path) 0
+#endif
+
+/* Test if `path' is absolute or not. (bird) */
+#ifdef DRVSEP
+#define IS_ABSPATH(path) (IS_SEP((path)[0]) || HAS_DRV(path))
+#else
+#define IS_ABSPATH(path) (IS_SEP((path)[0]))
+#endif
+
+/* Test if `path' contains any of the path separators including drive letter. (bird) */
+#ifdef ALTSEP
+#define HAS_ANYSEP(path) ( strchr((path), SEP) || strchr((path), ALTSEP) || HAS_DRV(path) )
+#else
+#define HAS_ANYSEP(path) ( strchr((path), SEP) || HAS_DRV(path) )
 #endif
 

python/trunk/Include/pyport.h

@@ -550 +550 @@
 
   BeOS and cygwin are the only other autoconf platform requiring special
-  linkage handling and both of these use __declspec().
+  linkage handling and both of these use __declspec(). Ditto for OS/2.
 */
-#if defined(__CYGWIN__) || defined(__BEOS__)
+#if defined(__CYGWIN__) || defined(__BEOS__) || defined(__OS2__)
 #       define HAVE_DECLSPEC_DLL
 #endif
@@ -564 +564 @@
                         /* module init functions inside the core need no external linkage */
                         /* except for Cygwin to handle embedding (FIXME: BeOS too?) */
-#                       if defined(__CYGWIN__)
+#                       if defined(__CYGWIN__) || defined(__OS2__)
 #                               define PyMODINIT_FUNC __declspec(dllexport) void
 #                       else /* __CYGWIN__ */
@@ -574 +574 @@
                         /* Under Cygwin, auto-import functions to prevent compilation */
                         /* failures similar to http://python.org/doc/FAQ.html#3.24 */
-#                       if !defined(__CYGWIN__)
+#                       if !defined(__CYGWIN__) && !defined(__OS2__)
 #                               define PyAPI_FUNC(RTYPE) __declspec(dllimport) RTYPE
 #                       endif /* !__CYGWIN__ */
+#                       if !defined(__OS2__)
 #                       define PyAPI_DATA(RTYPE) extern __declspec(dllimport) RTYPE
+#                       endif /* !__OS2__ */
                         /* module init functions outside the core must be exported */
 #                       if defined(__cplusplus)