diff options
| author | Tim Peters <tim.peters@gmail.com> | 2001-05-14 22:32:33 (GMT) |
|---|---|---|
| committer | Tim Peters <tim.peters@gmail.com> | 2001-05-14 22:32:33 (GMT) |
| commit | 58e0a8c13015627b5cd4abff6563bef02532596c (patch) | |
| tree | 7734b82cb756f5a4e534678d6b236b6fb51f5ab5 /Modules | |
| parent | 460f0691dff8e8f36b325a87f1af25ca6571ddad (diff) | |
| download | cpython-58e0a8c13015627b5cd4abff6563bef02532596c.zip cpython-58e0a8c13015627b5cd4abff6563bef02532596c.tar.gz cpython-58e0a8c13015627b5cd4abff6563bef02532596c.tar.bz2 | |
SF patch #418147 Fixes to allow compiling w/ Borland, from Stephen Hansen.
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/posixmodule.c | 18 | ||||
| -rw-r--r-- | Modules/timemodule.c | 8 |
2 files changed, 13 insertions, 13 deletions
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c index 430a44a..3a85798 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -63,12 +63,6 @@ corresponding Unix manual entries for more information on calls."; #ifdef __BORLANDC__ /* Borland compiler */ #define HAVE_EXECV 1 #define HAVE_GETCWD 1 -#define HAVE_GETEGID 1 -#define HAVE_GETEUID 1 -#define HAVE_GETGID 1 -#define HAVE_GETPPID 1 -#define HAVE_GETUID 1 -#define HAVE_KILL 1 #define HAVE_OPENDIR 1 #define HAVE_PIPE 1 #define HAVE_POPEN 1 @@ -152,7 +146,11 @@ extern int rmdir(char *); extern int chdir(const char *); extern int rmdir(const char *); #endif +#ifdef __BORLANDC__ +extern int chmod(const char *, int); +#else extern int chmod(const char *, mode_t); +#endif extern int chown(const char *, uid_t, gid_t); extern char *getcwd(char *, int); extern char *strerror(int); @@ -5666,18 +5664,18 @@ all_ins(PyObject *d) } -#if ( defined(_MSC_VER) || defined(__WATCOMC__) ) && !defined(__QNX__) +#if (defined(_MSC_VER) || defined(__WATCOMC__) || defined(__BORLANDC__)) && !defined(__QNX__) #define INITFUNC initnt #define MODNAME "nt" -#else -#if defined(PYOS_OS2) + +#elif defined(PYOS_OS2) #define INITFUNC initos2 #define MODNAME "os2" + #else #define INITFUNC initposix #define MODNAME "posix" #endif -#endif DL_EXPORT(void) INITFUNC(void) diff --git a/Modules/timemodule.c b/Modules/timemodule.c index 0c5c257..0a54a93 100644 --- a/Modules/timemodule.c +++ b/Modules/timemodule.c @@ -41,17 +41,19 @@ extern int ftime(struct timeb *); #else #ifdef MS_WINDOWS #include <windows.h> -#ifdef MS_WIN16 +#if defined(MS_WIN16) || defined(__BORLANDC__) /* These overrides not needed for Win32 */ #define timezone _timezone #define tzname _tzname #define daylight _daylight +#endif /* MS_WIN16 || __BORLANDC__ */ +#ifdef MS_WIN16 #define altzone _altzone #endif /* MS_WIN16 */ #endif /* MS_WINDOWS */ #endif /* !__WATCOMC__ || __QNX__ */ -#if defined(MS_WIN32) && !defined(MS_WIN64) +#if defined(MS_WIN32) && !defined(MS_WIN64) && !defined(__BORLANDC__) /* Win32 has better clock replacement XXX Win64 does not yet, but might when the platform matures. */ #include <largeint.h> @@ -146,7 +148,7 @@ time_clock(PyObject *self, PyObject *args) } #endif /* HAVE_CLOCK */ -#if defined(MS_WIN32) && !defined(MS_WIN64) +#if defined(MS_WIN32) && !defined(MS_WIN64) && !defined(__BORLANDC__) /* Due to Mark Hammond */ static PyObject * time_clock(PyObject *self, PyObject *args) |