diff options
| author | Gurusamy Sarathy <gsar@cpan.org> | 1998-07-05 00:35:27 +0000 |
|---|---|---|
| committer | Gurusamy Sarathy <gsar@cpan.org> | 1998-07-05 00:35:27 +0000 |
| commit | 7231175158f8ebe4d4c89fd774d89f1e9de28649 (patch) | |
| tree | e9c567a660a223412ed950e0091d88e611b75cf0 /win32 | |
| parent | 1116284222923a1670dbbe2205884d0616c81dfc (diff) | |
| download | perl-7231175158f8ebe4d4c89fd774d89f1e9de28649.tar.gz | |
patchlevel up to 5.004_70, various tweaks
* fix taint problems due to maintbranch regression
* PERL_OBJECT now builds again
* deal with C++ strong-typing problems in hv.c
* fix mismatch in "reserved word" diagnostic
p4raw-id: //depot/perl@1311
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/perlhost.h | 19 | ||||
| -rw-r--r-- | win32/win32.c | 12 |
2 files changed, 6 insertions, 25 deletions
diff --git a/win32/perlhost.h b/win32/perlhost.h index a4c2e3ce51..10abef93dc 100644 --- a/win32/perlhost.h +++ b/win32/perlhost.h @@ -32,13 +32,6 @@ extern CPerlObj *pPerl; err = errno;\ return ret; -extern int g_closedir(DIR *dirp); -extern DIR * g_opendir(char *filename); -extern struct direct * g_readdir(DIR *dirp); -extern void g_rewinddir(DIR *dirp); -extern void g_seekdir(DIR *dirp, long loc); -extern long g_telldir(DIR *dirp); - class CPerlDir : public IPerlDir { public: @@ -57,27 +50,27 @@ public: }; virtual int Close(DIR *dirp, int &err) { - return g_closedir(dirp); + return win32_closedir(dirp); }; virtual DIR *Open(char *filename, int &err) { - return g_opendir(filename); + return win32_opendir(filename); }; virtual struct direct *Read(DIR *dirp, int &err) { - return g_readdir(dirp); + return win32_readdir(dirp); }; virtual void Rewind(DIR *dirp, int &err) { - g_rewinddir(dirp); + win32_rewinddir(dirp); }; virtual void Seek(DIR *dirp, long loc, int &err) { - g_seekdir(dirp, loc); + win32_seekdir(dirp, loc); }; virtual long Tell(DIR *dirp, int &err) { - return g_telldir(dirp); + return win32_telldir(dirp); }; }; diff --git a/win32/win32.c b/win32/win32.c index 03552debbf..ef59a8f2ab 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -87,18 +87,6 @@ int _CRT_glob = 0; #define do_spawn g_do_spawn #undef do_exec #define do_exec g_do_exec -#undef opendir -#define opendir g_opendir -#undef readdir -#define readdir g_readdir -#undef telldir -#define telldir g_telldir -#undef seekdir -#define seekdir g_seekdir -#undef rewinddir -#define rewinddir g_rewinddir -#undef closedir -#define closedir g_closedir #undef getlogin #define getlogin g_getlogin #endif |