aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBruce Momjian <bruce@momjian.us>2003-05-09 16:59:43 +0000
committerBruce Momjian <bruce@momjian.us>2003-05-09 16:59:43 +0000
commitd85a0a6bef965192df751532d38bbe8f4ec4ccd7 (patch)
treefae7aafa0105d172b17e4f1a56086b9c1da66264 /src
parent384bbdd0e119cf034300c414cdad6bbdc06cb84d (diff)
downloadpostgresql-d85a0a6bef965192df751532d38bbe8f4ec4ccd7.tar.gz
postgresql-d85a0a6bef965192df751532d38bbe8f4ec4ccd7.zip
More cleanups now that we have crypt().
Diffstat (limited to 'src')
-rw-r--r--src/include/c.h6
-rw-r--r--src/include/port/qnx4.h2
-rw-r--r--src/interfaces/libpq/win32.h5
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