Chris Herborth <chrish@pobox.com>:
Minor updates for BeOS R5.
Use of OSError in test.test_fork1 changed to TestSkipped, with corresponding
change in BeOS/README (by Fred).
This closes SourceForge patch #100978.
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index d7755bf..d5290f6 100644
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -3620,11 +3620,6 @@
"putenv(key, value) -> None\n\
Change or add an environment variable.";
-#ifdef __BEOS__
-/* We have putenv(), but not in the headers (as of PR2). - [cjh] */
-int putenv( const char *str );
-#endif
-
/* Save putenv() parameters as values here, so we can collect them when they
* get re-set with another call for the same key. */
static PyObject *posix_putenv_garbage;
diff --git a/Modules/pwdmodule.c b/Modules/pwdmodule.c
index 1efe81a..7f58ed3 100644
--- a/Modules/pwdmodule.c
+++ b/Modules/pwdmodule.c
@@ -29,13 +29,6 @@
static PyObject *
mkpwent(struct passwd *p)
{
-#ifdef __BEOS__
- /* For faking the GECOS field. - [cjh] */
- char *be_user = NULL;
-
- be_user = getenv( "USER" );
-#endif
-
return Py_BuildValue(
"(ssllsss)",
p->pw_name,
@@ -49,12 +42,7 @@
(long)p->pw_uid,
(long)p->pw_gid,
#endif
-#ifdef __BEOS__
-/* BeOS doesn't have a GECOS field, oddly enough. - [cjh] */
- be_user ? be_user : "baron",
-#else
p->pw_gecos,
-#endif
p->pw_dir,
p->pw_shell);
}
diff --git a/Modules/timemodule.c b/Modules/timemodule.c
index fa40762..8cb7484 100644
--- a/Modules/timemodule.c
+++ b/Modules/timemodule.c
@@ -70,13 +70,10 @@
#endif
#ifdef __BEOS__
+#include <time.h>
/* For bigtime_t, snooze(). - [cjh] */
#include <support/SupportDefs.h>
#include <kernel/OS.h>
-#ifndef CLOCKS_PER_SEC
-/* C'mon, fix the bloody headers... - [cjh] */
-#define CLOCKS_PER_SEC 1000
-#endif
#endif
/* Forward declarations */