From d85a0a6bef965192df751532d38bbe8f4ec4ccd7 Mon Sep 17 00:00:00 2001 From: Bruce Momjian <bruce@momjian.us> Date: Fri, 9 May 2003 16:59:43 +0000 Subject: [PATCH] More cleanups now that we have crypt(). --- src/include/c.h | 6 +++++- src/include/port/qnx4.h | 2 -- src/interfaces/libpq/win32.h | 5 ----- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/include/c.h b/src/include/c.h index a69bb99c29c..3cb185e5c7f 100644 --- a/src/include/c.h +++ b/src/include/c.h @@ -12,7 +12,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: c.h,v 1.143 2003/05/09 16:26:29 momjian Exp $ + * $Id: c.h,v 1.144 2003/05/09 16:59:43 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -798,6 +798,10 @@ extern int vsnprintf(char *str, size_t count, const char *fmt, va_list args); * Default "extern" declarations or macro substitutes for library routines. * When necessary, these routines are provided by files in src/port/. */ +#ifndef HAVE_CRYPT +char *crypt(const char *key, const char *setting); +#endif + #ifndef HAVE_FSEEKO #define fseeko(a, b, c) fseek((a), (b), (c)) #define ftello(a) ftell((a)) diff --git a/src/include/port/qnx4.h b/src/include/port/qnx4.h index b19e76793ae..291abed0de7 100644 --- a/src/include/port/qnx4.h +++ b/src/include/port/qnx4.h @@ -26,7 +26,5 @@ typedef unsigned char slock_t; extern int isnan(double dsrc); -extern char *crypt(const char *, const char *); - extern long random(void); extern void srandom(unsigned int seed); diff --git a/src/interfaces/libpq/win32.h b/src/interfaces/libpq/win32.h index e0abd87678d..7f3f5cbd629 100644 --- a/src/interfaces/libpq/win32.h +++ b/src/interfaces/libpq/win32.h @@ -27,11 +27,6 @@ #define vsnprintf(a,b,c,d) _vsnprintf(a,b,c,d) #define snprintf _snprintf -/* - * crypt not available (yet) - */ -#define crypt(a,b) ((char *) a) - #undef EAGAIN /* doesn't apply on sockets */ #undef EINTR #define EINTR WSAEINTR -- GitLab