diff options
| author | Gurusamy Sarathy <gsar@cpan.org> | 1998-01-13 02:46:53 +0000 |
|---|---|---|
| committer | Gurusamy Sarathy <gsar@cpan.org> | 1998-01-13 02:46:53 +0000 |
| commit | d07c2202867c84a305417e42e522ca39d055c62a (patch) | |
| tree | 61abe56eb09e388c565e410cebc8a0d7778ffd11 /x2p | |
| parent | 2fd1c6b8c969281de42d3830c930f0cea98c16de (diff) | |
| download | perl-d07c2202867c84a305417e42e522ca39d055c62a.tar.gz | |
[win32] various tweaks to build support (NOTE: meant for 5.004_57)
- build and install x2p
- fix installperl warnings on win32
- `make install` now does puts the archlibs in right places
- makefiles don't default to USE_THREADS anymore
- sync config.{b,g,v}c
- sync makefile.mk -> Makefile
p4raw-id: //depot/win32/perl@416
Diffstat (limited to 'x2p')
| -rw-r--r-- | x2p/a2p.h | 25 | ||||
| -rw-r--r-- | x2p/a2py.c | 14 |
2 files changed, 34 insertions, 5 deletions
@@ -9,12 +9,37 @@ */ #define VOIDUSED 1 + +#ifdef WIN32 +#define _INC_WIN32_PERL5 /* kludge around win32 stdio layer */ +#endif + #ifdef VMS # include "config.h" #else # include "../config.h" #endif +#ifdef WIN32 +#undef USE_STDIO_PTR /* XXX fast gets won't work, must investigate */ +# ifndef STANDARD_C +# define STANDARD_C +# endif +# if defined(__BORLANDC__) +# pragma warn -ccc +# pragma warn -rch +# pragma warn -sig +# pragma warn -pia +# pragma warn -par +# pragma warn -aus +# pragma warn -use +# pragma warn -csu +# pragma warn -pro +# elif defined(_MSC_VER) +# elif defined(__MINGW32__) +# endif +#endif + #if defined(__STDC__) || defined(vax11c) || defined(_AIX) || defined(__stdc__) || defined(__cplusplus) # define STANDARD_C 1 #endif diff --git a/x2p/a2py.c b/x2p/a2py.c index 202d5921e0..fefa81da7e 100644 --- a/x2p/a2py.c +++ b/x2p/a2py.c @@ -8,7 +8,7 @@ * $Log: a2py.c,v $ */ -#ifdef OS2 +#if defined(OS2) || defined(WIN32) #include "../patchlevel.h" #endif #include "util.h" @@ -26,7 +26,9 @@ int oper4(int type, int arg1, int arg2, int arg3, int arg4); int oper5(int type, int arg1, int arg2, int arg3, int arg4, int arg5); STR *walk(int useval, int level, register int node, int *numericptr, int minprec); -#ifdef OS2 +#if defined(OS2) || defined(WIN32) +static void usage(void); + static void usage() { @@ -86,9 +88,11 @@ main(register int argc, register char **argv, register char **env) case 0: break; default: - fatal("Unrecognized switch: %s\n",argv[0]); -#ifdef OS2 +#if defined(OS2) || defined(WIN32) + fprintf(stderr, "Unrecognized switch: %s\n",argv[0]); usage(); +#else + fatal("Unrecognized switch: %s\n",argv[0]); #endif } } @@ -97,7 +101,7 @@ main(register int argc, register char **argv, register char **env) /* open script */ if (argv[0] == Nullch) { -#ifdef OS2 +#if defined(OS2) || defined(WIN32) if ( isatty(fileno(stdin)) ) usage(); #endif |