.dc -> .pc

#include file and prototype fixes

diff --git a/dbck/Imakefile b/dbck/Imakefile
index dc9939eef34d466c488051de3f2441bee8a1605b..4e39b7d7869902520ccbb73b9f0d84623a72ac18 100644 (file)
--- a/dbck/Imakefile
+++ b/dbck/Imakefile
@@ -10,7 +10,7 @@
 
 SRCS = dbck.h dbck.c fix.c phase1.c phase2.c phase3.c phase4.c nhash.c
 OBJS = dbck.o fix.o phase1.o phase2.o phase3.o phase4.o nhash.o
-CODE = dbck.h dbck.dc fix.dc phase1.dc phase2.dc phase3.dc phase4.dc nhash.c
+CODE = dbck.h dbck.pc fix.pc phase1.pc phase2.pc phase3.pc phase4.pc nhash.c
 SRCDIR=$(SRCTOP)/dbck
 sqlrule()
 

diff --git a/dbck/dbck.h b/dbck/dbck.h
index 252fbccfc21264f75a2cdeec5d74a800e8f4b488..6b1a9fc17cba809b28e245e5868ed6ded32d507f 100644 (file)
--- a/dbck/dbck.h
+++ b/dbck/dbck.h
@@ -10,7 +10,9 @@
 #include <moira_site.h>
 #include <mit-copyright.h>
 
-#define NULL 0
+#ifndef NULL
+#define NULL ((void*)0)
+#endif
 
 #define MODE_ASK 1
 #define MODE_NO 2

diff --git a/dbck/dbck.dc b/dbck/dbck.pc
similarity index 98%
rename from dbck/dbck.dc
rename to dbck/dbck.pc
index 4c644ef336c8e55fab284337cd36d3987386a712..7bdea4d9599a804f21a1ed8fee092683faeb4873 100644 (file)
--- a/dbck/dbck.dc
+++ b/dbck/dbck.pc
@@ -9,7 +9,7 @@
 
 #include <mit-copyright.h>
 #include <stdio.h>
-#include <strings.h>
+#include <string.h>
 #include <signal.h>
 #include "dbck.h"
 EXEC SQL INCLUDE sqlca;
@@ -32,6 +32,7 @@ struct save_queue *modtables, *sq_create();
 void interrupt();
 SQLDA *mr_sqlda;
 
+extern SQLDA *sqlald(int,int,int);
 
 main(argc, argv)
 int argc;

diff --git a/dbck/fix.dc b/dbck/fix.pc
similarity index 100%
rename from dbck/fix.dc
rename to dbck/fix.pc

diff --git a/dbck/members.dc b/dbck/members.pc
similarity index 100%
rename from dbck/members.dc
rename to dbck/members.pc

diff --git a/dbck/nhash.c b/dbck/nhash.c
index b315116cdcf3f5fac2135211f1e1fa781d961dc3..a5bec4c13f5d1939f8979956e33e4fbc6d588794 100644 (file)
--- a/dbck/nhash.c
+++ b/dbck/nhash.c
@@ -9,6 +9,7 @@
 
 #include <mit-copyright.h>
 #include <ctype.h>
+#include <stdlib.h>
 /* #include <moira.h> */
 
 struct int_bucket {
@@ -21,9 +22,9 @@ struct int_hash {
     struct int_bucket **data;
 };
 
-extern char *malloc();
-
+#ifndef NULL
 #define NULL 0
+#endif
 #define int_hash_func(h, key) (key >= 0 ? (key % h->size) : (-key % h->size))
 
 /* Create an int_hash table.  The size is just a hint, not a maximum. */

diff --git a/dbck/phase1.dc b/dbck/phase1.pc
similarity index 100%
rename from dbck/phase1.dc
rename to dbck/phase1.pc

diff --git a/dbck/phase2.dc b/dbck/phase2.pc
similarity index 100%
rename from dbck/phase2.dc
rename to dbck/phase2.pc

diff --git a/dbck/phase3.dc b/dbck/phase3.pc
similarity index 99%
rename from dbck/phase3.dc
rename to dbck/phase3.pc
index e91199ad4fb1c8ba1efcf06d4a0d2b2228698e33..529c0e8a82a6ebe790ac509235d29894e5a4e0fe 100644 (file)
--- a/dbck/phase3.dc
+++ b/dbck/phase3.pc
@@ -8,8 +8,6 @@
 #include <mit-copyright.h>
 #include "dbck.h"
 
-#define NULL 0
-
 static char phase3_qc_rcsid[] = "$Header$";
 
 

diff --git a/dbck/phase4.dc b/dbck/phase4.pc
similarity index 100%
rename from dbck/phase4.dc
rename to dbck/phase4.pc