diff options
| author | Fred Drake <fdrake@acm.org> | 2000-08-15 18:52:33 (GMT) |
|---|---|---|
| committer | Fred Drake <fdrake@acm.org> | 2000-08-15 18:52:33 (GMT) |
| commit | 56221a7cfa8f361f4310b63b74091766c50dd7f8 (patch) | |
| tree | fa463c682b2f773a8b2cc5f27aa936a8853d1a89 /Modules | |
| parent | d3415791783dcdf6f6dedd2a878ea0e09aa39fc9 (diff) | |
| download | cpython-56221a7cfa8f361f4310b63b74091766c50dd7f8.zip cpython-56221a7cfa8f361f4310b63b74091766c50dd7f8.tar.gz cpython-56221a7cfa8f361f4310b63b74091766c50dd7f8.tar.bz2 | |
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.
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/posixmodule.c | 5 | ||||
| -rw-r--r-- | Modules/pwdmodule.c | 12 | ||||
| -rw-r--r-- | Modules/timemodule.c | 5 |
3 files changed, 1 insertions, 21 deletions
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 @@ static char posix_putenv__doc__[] = "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 @@ exception is raised if the entry asked for cannot be found."; 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 @@ mkpwent(struct passwd *p) (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 @@ extern int ftime(struct timeb *); #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 */ |