summaryrefslogtreecommitdiff
path: root/src/include
diff options
context:
space:
mode:
authorBruce Momjian <bruce@momjian.us>1999-06-12 14:07:33 +0000
committerBruce Momjian <bruce@momjian.us>1999-06-12 14:07:33 +0000
commit0c3281ce7c0b66d2f6a9d06b8bd475691c37c2b5 (patch)
tree5bdf0164cda7f52c9577a6cc3c6676a5fad4eee6 /src/include
parent603e153bb8acc27773807a7eacf4e7c3cf8a5a17 (diff)
downloadpostgresql-0c3281ce7c0b66d2f6a9d06b8bd475691c37c2b5.tar.gz
Reversed out Massimo patch.
Diffstat (limited to 'src/include')
-rw-r--r--src/include/utils/portal.h6
-rw-r--r--src/include/utils/trace.h11
2 files changed, 5 insertions, 12 deletions
diff --git a/src/include/utils/portal.h b/src/include/utils/portal.h
index 390ee2116d..61e6976766 100644
--- a/src/include/utils/portal.h
+++ b/src/include/utils/portal.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: portal.h,v 1.14 1999/06/12 14:05:40 momjian Exp $
+ * $Id: portal.h,v 1.15 1999/06/12 14:07:32 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -80,10 +80,6 @@ extern void EndPortalAllocMode(void);
extern PortalVariableMemory PortalGetVariableMemory(Portal portal);
extern PortalHeapMemory PortalGetHeapMemory(Portal portal);
-#ifdef FREE_TUPLE_MEMORY
-bool PortalHeapMemoryIsValid(MemoryContext context, Pointer pointer);
-#endif
-
/* estimate of the maximum number of open portals a user would have,
* used in initially sizing the PortalHashTable in EnablePortalManager()
*/
diff --git a/src/include/utils/trace.h b/src/include/utils/trace.h
index 1affd968b7..3174026ca5 100644
--- a/src/include/utils/trace.h
+++ b/src/include/utils/trace.h
@@ -64,9 +64,6 @@ enum pg_option_enum {
OPT_SYSLOG, /* use syslog for error messages */
OPT_HOSTLOOKUP, /* enable hostname lookup in ps_status */
OPT_SHOWPORTNUMBER, /* show port number in ps_status */
-#ifdef FREE_TUPLE_MEMORY
- OPT_FREE_TUPLE_MEMORY, /* try to pfree memory for each tuple */
-#endif
NUM_PG_OPTIONS /* must be the last item of enum */
};
@@ -86,9 +83,9 @@ extern int pg_options[NUM_PG_OPTIONS];
#endif /* TRACE_H */
/*
- * Local Variables:
- * tab-width: 4
- * c-indent-level: 4
- * c-basic-offset: 4
+ * Local variables:
+ * tab-width: 4
+ * c-indent-level: 4
+ * c-basic-offset: 4
* End:
*/