diff options
| author | Gurusamy Sarathy <gsar@cpan.org> | 1997-11-10 00:57:53 +0000 |
|---|---|---|
| committer | Gurusamy Sarathy <gsar@cpan.org> | 1997-11-10 00:57:53 +0000 |
| commit | d55594aef6b1fb9e305275c3d19a25e4cdfb2cda (patch) | |
| tree | f7d6379858b9595f060beee6161b43a373132fe9 /win32/win32io.c | |
| parent | 5cb186c2cd2ac09e46b98e7cfd9fde70c8a3481c (diff) | |
| download | perl-d55594aef6b1fb9e305275c3d19a25e4cdfb2cda.tar.gz | |
Initial (untested) merge of all non-ansi changes on ansiperl branch
into win32 branch.
p4raw-id: //depot/win32/perl@221
Diffstat (limited to 'win32/win32io.c')
| -rw-r--r-- | win32/win32io.c | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/win32/win32io.c b/win32/win32io.c index eeb684620b..0e2e649059 100644 --- a/win32/win32io.c +++ b/win32/win32io.c @@ -1,13 +1,11 @@ -#ifdef __cplusplus -extern "C" { -#endif #define WIN32_LEAN_AND_MEAN +#include <stdio.h> +extern int my_fclose(FILE *pf); +#include "EXTERN.h" #define WIN32IO_IS_STDIO -#define EXT #include <windows.h> -#include <stdio.h> #include <stdlib.h> #include <io.h> #include <sys/stat.h> @@ -17,6 +15,16 @@ extern "C" { #include <errno.h> #include <process.h> #include <direct.h> + + +#ifdef __cplusplus +#define START_EXTERN_C extern "C" { +#define END_EXTERN_C } +#else +#define START_EXTERN_C +#define END_EXTERN_C +#endif + #include "win32iop.h" /* @@ -238,7 +246,6 @@ my_flock(int fd, int oper) #undef LK_ERR #undef LK_LEN -EXT int my_fclose(FILE *pf); #ifdef PERLDLL __declspec(dllexport) @@ -321,7 +328,6 @@ WIN32_IOSUBSYSTEM win32stdio = { }; -#ifdef __cplusplus -} -#endif + + |