summaryrefslogtreecommitdiff
path: root/win32
diff options
context:
space:
mode:
authorGurusamy Sarathy <gsar@cpan.org>1999-11-08 20:30:58 +0000
committerGurusamy Sarathy <gsar@cpan.org>1999-11-08 20:30:58 +0000
commit25dbdbbc9baa4ce445d83d58ac5170ed28a46c2c (patch)
tree7d1009c00fb80693041a735fb195799ac423573d /win32
parent350de78d9c02710bb008e9ca922c78ba251ec366 (diff)
downloadperl-25dbdbbc9baa4ce445d83d58ac5170ed28a46c2c.tar.gz
win32 symbol export tweak
p4raw-id: //depot/perl@4540
Diffstat (limited to 'win32')
-rw-r--r--win32/win32.c4
-rw-r--r--win32/win32iop.h6
2 files changed, 2 insertions, 8 deletions
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