[Python-checkins] CVS: python/dist/src/Modules posixmodule.c,2.165,2.166 pwdmodule.c,1.22,1.23 timemodule.c,2.100,2.101
Fred L. Drake
python-dev@python.org
Tue, 15 Aug 2000 11:52:35 -0700
Update of /cvsroot/python/python/dist/src/Modules
In directory slayer.i.sourceforge.net:/tmp/cvs-serv31586/Modules
Modified Files:
posixmodule.c pwdmodule.c timemodule.c
Log Message:
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.
Index: posixmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/posixmodule.c,v
retrieving revision 2.165
retrieving revision 2.166
diff -C2 -r2.165 -r2.166
*** posixmodule.c 2000/08/15 00:46:38 2.165
--- posixmodule.c 2000/08/15 18:52:33 2.166
***************
*** 3621,3629 ****
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. */
--- 3621,3624 ----
Index: pwdmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/pwdmodule.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** pwdmodule.c 2000/08/03 02:34:44 1.22
--- pwdmodule.c 2000/08/15 18:52:33 1.23
***************
*** 30,40 ****
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)",
--- 30,33 ----
***************
*** 50,59 ****
(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);
--- 43,47 ----
Index: timemodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/timemodule.c,v
retrieving revision 2.100
retrieving revision 2.101
diff -C2 -r2.100 -r2.101
*** timemodule.c 2000/08/03 02:34:44 2.100
--- timemodule.c 2000/08/15 18:52:33 2.101
***************
*** 71,81 ****
#ifdef __BEOS__
/* 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
--- 71,78 ----
#ifdef __BEOS__
+ #include <time.h>
/* For bigtime_t, snooze(). - [cjh] */
#include <support/SupportDefs.h>
#include <kernel/OS.h>
#endif