summaryrefslogtreecommitdiff
path: root/src/include
diff options
context:
space:
mode:
Diffstat (limited to 'src/include')
-rw-r--r--src/include/libpq/libpq.h4
-rw-r--r--src/include/miscadmin.h7
-rw-r--r--src/include/tcop/tcopprot.h3
3 files changed, 8 insertions, 6 deletions
diff --git a/src/include/libpq/libpq.h b/src/include/libpq/libpq.h
index 0893b646fb..6768626f98 100644
--- a/src/include/libpq/libpq.h
+++ b/src/include/libpq/libpq.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: libpq.h,v 1.13 1998/03/02 05:42:06 scrappy Exp $
+ * $Id: libpq.h,v 1.14 1998/05/19 18:05:55 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -269,7 +269,7 @@ extern void pq_putstr(char *s);
extern void pq_putnchar(char *s, int n);
extern void pq_putint(int i, int b);
extern int pq_sendoob(char *msg, int len);
-extern int pq_recvoob(char *msgPtr, int *lenPtr);
+extern int pq_recvoob(char *msgPtr, int len);
extern int pq_getinaddr(struct sockaddr_in * sin, char *host, int port);
extern int pq_getinserv(struct sockaddr_in * sin, char *host, char *serv);
extern int
diff --git a/src/include/miscadmin.h b/src/include/miscadmin.h
index f2b26d3bd1..f5da6e628a 100644
--- a/src/include/miscadmin.h
+++ b/src/include/miscadmin.h
@@ -11,7 +11,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: miscadmin.h,v 1.22 1998/04/05 21:04:50 momjian Exp $
+ * $Id: miscadmin.h,v 1.23 1998/05/19 18:05:52 momjian Exp $
*
* NOTES
* some of the information in this file will be moved to
@@ -35,8 +35,9 @@ extern int PostmasterMain(int argc, char *argv[]);
* from utils/init/globals.c
*/
extern int Portfd;
-extern int Noversion;
-extern int Quiet;
+extern bool Noversion;
+extern bool Quiet;
+extern bool QueryCancel;
extern char *DataDir;
extern int MyProcPid;
diff --git a/src/include/tcop/tcopprot.h b/src/include/tcop/tcopprot.h
index 0e2706f05d..dbd9fdba74 100644
--- a/src/include/tcop/tcopprot.h
+++ b/src/include/tcop/tcopprot.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: tcopprot.h,v 1.11 1998/02/26 04:43:41 momjian Exp $
+ * $Id: tcopprot.h,v 1.12 1998/05/19 18:05:58 momjian Exp $
*
* OLD COMMENTS
* This file was created so that other c files could get the two
@@ -34,6 +34,7 @@ pg_exec_query_dest(char *query_string, char **argv, Oid *typev,
extern void handle_warn(SIGNAL_ARGS);
extern void die(SIGNAL_ARGS);
+extern void CancelQuery(void);
extern int PostgresMain(int argc, char *argv[]);
extern void ResetUsage(void);
extern void ShowUsage(void);