X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=win32%2Fconfig_H.vc;h=ab2bec6dc18784299c11dd02528312dd1299a293;hb=a245ea2dae7bd663a3604c1eaa354b6ee6780707;hp=9e383f93d01e238c014ff149b0e10f887e001725;hpb=be44fb0e48bd19a864cf6b6d066beef8e960db7d;p=p5sagit%2Fp5-mst-13.2.git diff --git a/win32/config_H.vc b/win32/config_H.vc index 9e383f9..ab2bec6 100644 --- a/win32/config_H.vc +++ b/win32/config_H.vc @@ -34,8 +34,8 @@ * This symbol is the filename expanded version of the BIN symbol, for * programs that do not want to deal with that at run-time. */ -#define BIN "c:\\perl5004.5x\\bin" /**/ -#define BIN_EXP "c:\\perl5004.5x\\bin" /**/ +#define BIN "c:\\perl\\5.00501\\bin\\MSWin32-x86" /**/ +#define BIN_EXP "c:\\perl\\5.00501\\bin\\MSWin32-x86" /**/ /* CPPSTDIN: * This symbol contains the first part of the string which will invoke @@ -49,7 +49,7 @@ * output. This symbol will have the value "-" if CPPSTDIN needs a minus * to specify standard input, otherwise the value is "". */ -#define CPPSTDIN "cl -E" +#define CPPSTDIN "cl -nologo -E" #define CPPMINUS "" /* HAS_ALARM: @@ -788,7 +788,7 @@ * This symbol, if defined, indicates that the waitpid routine is * available to wait for child process. */ -/*#define HAS_WAITPID /**/ +#define HAS_WAITPID /**/ /* HAS_WCSTOMBS: * This symbol, if defined, indicates that the wcstombs routine is @@ -802,6 +802,12 @@ */ #define HAS_WCTOMB /**/ +/* I_ARPA_INET: + * This symbol, if defined, indicates that exists and should + * be included. + */ +/*#define I_ARPA_INET /**/ + /* I_DBM: * This symbol, if defined, indicates that exists and should * be included. @@ -855,7 +861,27 @@ * This symbol, if defined, indicates to the C program that it should * include . */ -#define I_GRP /**/ +/* GRPASSWD: + * This symbol, if defined, indicates to the C program that struct group + * contains gr_passwd. + */ +/* HAS_SETGRENT: + * This symbol, if defined, indicates that the getgrent routine is + * available for initializing sequential access of the group database. + */ +/* HAS_GETGRENT: + * This symbol, if defined, indicates that the getgrent routine is + * available for sequential access of the group database. + */ +/* HAS_ENDGRENT: + * This symbol, if defined, indicates that the getgrent routine is + * available for finalizing sequential access of the group database. + */ +/*#define I_GRP /**/ +/*#define GRPASSWD /**/ +/*#define HAS_SETGRENT /**/ +/*#define HAS_GETGRENT /**/ +/*#define HAS_ENDGRENT /**/ /* I_LIMITS: * This symbol, if defined, indicates to the C program that it should @@ -1053,21 +1079,6 @@ */ /*#define I_VFORK /**/ -/* Free_t: - * This variable contains the return type of free(). It is usually - * void, but occasionally int. - */ -/* Malloc_t: - * This symbol is the type of pointer returned by malloc and realloc. - */ -#define Malloc_t void * /**/ -#define Free_t void /**/ - -/* MYMALLOC: - * This symbol, if defined, indicates that we're using our own malloc. - */ -#define MYMALLOC /**/ - /* CAN_PROTOTYPE: * If defined, this macro indicates that the C compiler can handle * function prototypes. @@ -1101,31 +1112,6 @@ */ #define STDCHAR char /**/ -/* VOIDFLAGS: - * This symbol indicates how much support of the void type is given by this - * compiler. What various bits mean: - * - * 1 = supports declaration of void - * 2 = supports arrays of pointers to functions returning void - * 4 = supports comparisons between pointers to void functions and - * addresses of void functions - * 8 = suports declaration of generic void pointers - * - * The package designer should define VOIDUSED to indicate the requirements - * of the package. This can be done either by #defining VOIDUSED before - * including config.h, or by defining defvoidused in Myinit.U. If the - * latter approach is taken, only those flags will be tested. If the - * level of void support necessary is not present, defines void to int. - */ -#ifndef VOIDUSED -#define VOIDUSED 15 -#endif -#define VOIDFLAGS 15 -#if (VOIDFLAGS & VOIDUSED) != VOIDUSED -#define void int /* is void to be avoided? */ -#define M_VOID /* Xenix strikes again */ -#endif - /* MEM_ALIGNBYTES: * This symbol contains the number of bytes required to align a * double. Usual values are 2, 4 and 8. @@ -1450,22 +1436,6 @@ */ #define OSNAME "MSWin32" /**/ -/* ARCHLIB: - * This variable, if defined, holds the name of the directory in - * which the user wants to put architecture-dependent public - * library files for perl5. It is most often a local directory - * such as /usr/local/lib. Programs using this variable must be - * prepared to deal with filename expansion. If ARCHLIB is the - * same as PRIVLIB, it is not defined, since presumably the - * program already searches PRIVLIB. - */ -/* ARCHLIB_EXP: - * This symbol contains the ~name expanded version of ARCHLIB, to be used - * in programs that are not prepared to deal with ~ expansion at run-time. - */ -#define ARCHLIB "c:\\perl5004.5x\\lib\\MSWin32-x86" /**/ -#define ARCHLIB_EXP (win32_perllib_path(ARCHNAME,NULL)) /**/ - /* CAT2: * This macro catenates 2 tokens together. */ @@ -1616,12 +1586,6 @@ #define LONGLONGSIZE 8 /**/ #endif -/* HAS_MKSTEMP: - * This symbol, if defined, indicates that the mkstemp routine is - * available to create and open a unique temporary file. - */ -/*#define HAS_MKSTEMP /**/ - /* HAS_SETGROUPS: * This symbol, if defined, indicates that the setgroups() routine is * available to set the list of process groups. If unavailable, multiple @@ -1752,6 +1716,22 @@ * This symbol, if defined, indicates to the C program that struct passwd * contains pw_gecos. */ +/* PWPASSWD: + * This symbol, if defined, indicates to the C program that struct passwd + * contains pw_passwd. + */ +/* HAS_SETPWENT: + * This symbol, if defined, indicates that the getpwrent routine is + * available for initializing sequential access of the passwd database. + */ +/* HAS_GETPWENT: + * This symbol, if defined, indicates that the getpwent routine is + * available for sequential access of the password database. + */ +/* HAS_ENDPWENT: + * This symbol, if defined, indicates that the getpwent routine is + * available for finalizing sequential access of the passwd database. + */ /*#define I_PWD /**/ /*#define PWQUOTA /**/ /*#define PWAGE /**/ @@ -1760,19 +1740,25 @@ /*#define PWEXPIRE /**/ /*#define PWCOMMENT /**/ /*#define PWGECOS /**/ +/*#define PWPASSWD /**/ +/*#define HAS_SETPWENT /**/ +/*#define HAS_GETPWENT /**/ +/*#define HAS_ENDPWENT /**/ -/* PRIVLIB: - * This symbol contains the name of the private library for this package. - * The library is private in the sense that it needn't be in anyone's - * execution path, but it should be accessible by the world. The program - * should be prepared to do ~ expansion. +/* Free_t: + * This variable contains the return type of free(). It is usually + * void, but occasionally int. */ -/* PRIVLIB_EXP: - * This symbol contains the ~name expanded version of PRIVLIB, to be used - * in programs that are not prepared to deal with ~ expansion at run-time. +/* Malloc_t: + * This symbol is the type of pointer returned by malloc and realloc. */ -#define PRIVLIB "c:\\perl5004.5x\\lib" /**/ -#define PRIVLIB_EXP (win32_perllib_path(NULL)) /**/ +#define Malloc_t void * /**/ +#define Free_t void /**/ + +/* MYMALLOC: + * This symbol, if defined, indicates that we're using our own malloc. + */ +/*#define MYMALLOC /**/ /* SIG_NAME: * This symbol contains a list of signal names in order of @@ -1805,37 +1791,46 @@ #define SIG_NAME "ZERO", "INT", "QUIT", "ILL", "FPE", "KILL", "SEGV", "PIPE", "ALRM", "TERM", "CHLD", "BREAK", "ABRT", "STOP", "CONT", "CLD", 0 /**/ #define SIG_NUM 0, 2, 3, 4, 8, 9, 11, 13, 14, 15, 20, 21, 22, 23, 25, 20, 0 /**/ -/* SITEARCH: - * This symbol contains the name of the private library for this package. - * The library is private in the sense that it needn't be in anyone's - * execution path, but it should be accessible by the world. The program - * should be prepared to do ~ expansion. - * The standard distribution will put nothing in this directory. - * Individual sites may place their own extensions and modules in - * this directory. - */ -/* SITEARCH_EXP: - * This symbol contains the ~name expanded version of SITEARCH, to be used - * in programs that are not prepared to deal with ~ expansion at run-time. +/* VOIDFLAGS: + * This symbol indicates how much support of the void type is given by this + * compiler. What various bits mean: + * + * 1 = supports declaration of void + * 2 = supports arrays of pointers to functions returning void + * 4 = supports comparisons between pointers to void functions and + * addresses of void functions + * 8 = suports declaration of generic void pointers + * + * The package designer should define VOIDUSED to indicate the requirements + * of the package. This can be done either by #defining VOIDUSED before + * including config.h, or by defining defvoidused in Myinit.U. If the + * latter approach is taken, only those flags will be tested. If the + * level of void support necessary is not present, defines void to int. */ -#define SITEARCH "c:\\perl5004.5x\\lib\\site\\MSWin32-x86" /**/ -#define SITEARCH_EXP (win32_perllib_path("site",ARCHNAME,NULL)) /**/ +#ifndef VOIDUSED +#define VOIDUSED 15 +#endif +#define VOIDFLAGS 15 +#if (VOIDFLAGS & VOIDUSED) != VOIDUSED +#define void int /* is void to be avoided? */ +#define M_VOID /* Xenix strikes again */ +#endif -/* SITELIB: - * This symbol contains the name of the private library for this package. - * The library is private in the sense that it needn't be in anyone's - * execution path, but it should be accessible by the world. The program - * should be prepared to do ~ expansion. - * The standard distribution will put nothing in this directory. - * Individual sites may place their own extensions and modules in - * this directory. +/* ARCHLIB: + * This variable, if defined, holds the name of the directory in + * which the user wants to put architecture-dependent public + * library files for perl5. It is most often a local directory + * such as /usr/local/lib. Programs using this variable must be + * prepared to deal with filename expansion. If ARCHLIB is the + * same as PRIVLIB, it is not defined, since presumably the + * program already searches PRIVLIB. */ -/* SITELIB_EXP: - * This symbol contains the ~name expanded version of SITELIB, to be used +/* ARCHLIB_EXP: + * This symbol contains the ~name expanded version of ARCHLIB, to be used * in programs that are not prepared to deal with ~ expansion at run-time. */ -#define SITELIB "c:\\perl5004.5x\\lib\\site" /**/ -#define SITELIB_EXP (win32_perllib_path("site",NULL)) /**/ +#define ARCHLIB "c:\\perl\\5.00501\\lib\\MSWin32-x86" /**/ +/*#define ARCHLIB_EXP "" /**/ /* DLSYM_NEEDS_UNDERSCORE: * This symbol, if defined, indicates that we need to prepend an @@ -1870,6 +1865,51 @@ #define DB_Hash_t int /**/ #define DB_Prefix_t int /**/ +/* PRIVLIB: + * This symbol contains the name of the private library for this package. + * The library is private in the sense that it needn't be in anyone's + * execution path, but it should be accessible by the world. The program + * should be prepared to do ~ expansion. + */ +/* PRIVLIB_EXP: + * This symbol contains the ~name expanded version of PRIVLIB, to be used + * in programs that are not prepared to deal with ~ expansion at run-time. + */ +#define PRIVLIB "c:\\perl\\5.00501\\lib" /**/ +#define PRIVLIB_EXP (win32_get_privlib("5.00501")) /**/ + +/* SITEARCH: + * This symbol contains the name of the private library for this package. + * The library is private in the sense that it needn't be in anyone's + * execution path, but it should be accessible by the world. The program + * should be prepared to do ~ expansion. + * The standard distribution will put nothing in this directory. + * Individual sites may place their own extensions and modules in + * this directory. + */ +/* SITEARCH_EXP: + * This symbol contains the ~name expanded version of SITEARCH, to be used + * in programs that are not prepared to deal with ~ expansion at run-time. + */ +#define SITEARCH "c:\\perl\\site\\5.00501\\lib\\MSWin32-x86" /**/ +/*#define SITEARCH_EXP "" /**/ + +/* SITELIB: + * This symbol contains the name of the private library for this package. + * The library is private in the sense that it needn't be in anyone's + * execution path, but it should be accessible by the world. The program + * should be prepared to do ~ expansion. + * The standard distribution will put nothing in this directory. + * Individual sites may place their own extensions and modules in + * this directory. + */ +/* SITELIB_EXP: + * This symbol contains the ~name expanded version of SITELIB, to be used + * in programs that are not prepared to deal with ~ expansion at run-time. + */ +#define SITELIB "c:\\perl\\site\\5.00501\\lib" /**/ +#define SITELIB_EXP (win32_get_sitelib("5.00501")) /**/ + /* STARTPERL: * This variable contains the string to put in front of a perl * script to make sure (one hopes) that it runs with perl and not