summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruce Momjian2003-05-09 16:59:43 +0000
committerBruce Momjian2003-05-09 16:59:43 +0000
commit1b62fd0e67fc98d0865a067cc4b383e5c8be2170 (patch)
tree5c9557e7e011b6b80ad9ea973c470d02207bd28e
parente949cd13a66240a51b214ca08513961685651131 (diff)
More cleanups now that we have crypt().
-rw-r--r--src/include/c.h4
-rw-r--r--src/include/port/qnx4.h2
-rw-r--r--src/interfaces/libpq/win32.h5
3 files changed, 4 insertions, 7 deletions
diff --git a/src/include/c.h b/src/include/c.h
index 693de895b2..2c13c05e06 100644
--- a/src/include/c.h
+++ b/src/include/c.h
@@ -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 b19e76793a..291abed0de 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 e0abd87678..7f3f5cbd62 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