1. "#ifdef 0" is bad C. ifdef is for checking a macro and 0 is

an illegal macro name.  Correct syntax is "#if 0".  This is in...

From: Darren King 

diff --git a/src/backend/libpq/crypt.c b/src/backend/libpq/crypt.c
index b87b05cd4265832eb74440a9824cd3bbf2f98b52..dbda5e3e2b51944da5e86ea0b956ac05742a7e98 100644 (file)
--- a/src/backend/libpq/crypt.c
+++ b/src/backend/libpq/crypt.c
@@ -220,7 +220,7 @@ int crypt_getloginfo(const char* user, char** passwd, char** valuntil) {
 
 /*-------------------------------------------------------------------------*/
 
-#ifdef 0
+#if 0
 MsgType crypt_salt(const char* user) {
 
   char*     passwd;

diff --git a/src/backend/port/getrusage.c b/src/backend/port/getrusage.c
index 2859bb1af22c85804ddd49986a5f0d11e98491ba..48469919e6697719988d7ce14f99ed16a836b8ee 100644 (file)
--- a/src/backend/port/getrusage.c
+++ b/src/backend/port/getrusage.c
@@ -1,4 +1,4 @@
-/* $Id: getrusage.c,v 1.3 1997/12/19 13:34:27 scrappy Exp $ */
+/* $Id: getrusage.c,v 1.4 1998/02/01 00:02:59 scrappy Exp $ */
 
 #include                /* for pow() prototype */
 
@@ -6,11 +6,11 @@
 #include "rusagestub.h"
 #include "port-protos.h"
 
-#ifdef 0 /* this is from univel port ... how does compiler define? */
-         /* same for i386_solaris port ... how does compiler define? */
-         /* same for sco port ... how does compiler define? */
-         /* same for sparc_solaris port ... how does compiler define? */
-         /* same for svr4 port ... how does compiler define? */
+#if 0 /* this is from univel port ... how does compiler define? */
+      /* same for i386_solaris port ... how does compiler define? */
+      /* same for sco port ... how does compiler define? */
+      /* same for sparc_solaris port ... how does compiler define? */
+      /* same for svr4 port ... how does compiler define? */
 int
 getrusage(int who, struct rusage * rusage)
 {
@@ -53,7 +53,7 @@ getrusage(int who, struct rusage * rusage)
 }
 #endif
 
-#ifdef 0 /* this is for hpux port ... how does compiler define? */
+#if 0 /* this is for hpux port ... how does compiler define? */
 getrusage(int who, struct rusage * ru)
 {
     return (syscall(SYS_GETRUSAGE, who, ru));

diff --git a/src/include/libpq/crypt.h b/src/include/libpq/crypt.h
index 77d4fb7d03b1abf711261cbf9302e3b8c8820a6b..b1da83ac60318768f5808165ddc7052a66f60fb3 100644 (file)
--- a/src/include/libpq/crypt.h
+++ b/src/include/libpq/crypt.h
@@ -21,7 +21,7 @@ extern int        pwd_cache_count;
 
 extern char* crypt_getpwdfilename(void);
 extern char* crypt_getpwdreloadfilename(void);
-#ifdef 0
+#if 0
 extern MsgType crypt_salt(const char* user);
 #endif
 extern int crypt_verify(Port* port, const char* user, const char* pgpass);