diff options
| -rw-r--r-- | makedef.pl | 6 | ||||
| -rw-r--r-- | win32/win32.c | 4 | ||||
| -rw-r--r-- | win32/win32iop.h | 6 |
3 files changed, 3 insertions, 13 deletions
diff --git a/makedef.pl b/makedef.pl index 8ec55bdd35..5c38aad75a 100644 --- a/makedef.pl +++ b/makedef.pl @@ -455,11 +455,6 @@ unless ($define{'DEBUGGING'}) PL_watchok)]; } -if ($PLATFORM eq 'win32' && $define{'HAVE_DES_FCRYPT'}) - { - emit_symbols [qw(win32_crypt)]; - } - # functions from *.sym files my @syms = ($global_sym, $pp_sym, $globvar_sym); @@ -671,6 +666,7 @@ win32_rewinddir win32_closedir win32_longpath win32_os_id +win32_crypt )) { try_symbol($symbol); } diff --git a/win32/win32.c b/win32/win32.c index d3a7b404f7..4abb60df66 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -1548,7 +1548,6 @@ win32_alarm(unsigned int sec) return 0; } -#if defined(HAVE_DES_FCRYPT) || defined(PERL_OBJECT) #ifdef HAVE_DES_FCRYPT extern char * des_fcrypt(const char *txt, const char *salt, char *cbuf); #endif @@ -1561,11 +1560,10 @@ win32_crypt(const char *txt, const char *salt) dTHR; return des_fcrypt(txt, salt, w32_crypt_buffer); #else - die("The crypt() function is unimplemented due to excessive paranoia."); + Perl_croak(aTHX_ "The crypt() function is unimplemented due to excessive paranoia."); return Nullch; #endif } -#endif #ifdef USE_FIXED_OSFHANDLE diff --git a/win32/win32iop.h b/win32/win32iop.h index 9abb05fca6..e23000bc60 100644 --- a/win32/win32iop.h +++ b/win32/win32iop.h @@ -139,9 +139,7 @@ DllExport int win32_kill(int pid, int sig); DllExport unsigned long win32_os_id(void); DllExport void* win32_dynaload(const char*filename); -#if defined(HAVE_DES_FCRYPT) || defined(PERL_OBJECT) DllExport char * win32_crypt(const char *txt, const char *salt); -#endif END_EXTERN_C @@ -287,10 +285,8 @@ END_EXTERN_C #define closedir win32_closedir #define os_id win32_os_id -#ifdef HAVE_DES_FCRYPT #undef crypt -#define crypt win32_crypt -#endif +#define crypt(t,s) win32_crypt(t,s) #ifndef USE_WIN32_RTL_ENV #undef getenv |