From 0460f0502b8bd0cf19ebe1fd3bb75a9704be9857 Mon Sep 17 00:00:00 2001 From: Bruce Momjian Date: Mon, 22 May 2000 02:34:23 +0000 Subject: I am attempting to integrate postgres (v 7.0) with an open source project I am working on (Recall - a distributed, fault-tolerant, replicated, storage framework @ http://www.fault-tolerant.org). Recall is written in C++. I need to include the postgres headers and there are some problems when including the headers w/C++. Attached is a patch generated from postgres/src that fixes my problems. I was hoping to get this into the main source. It's very small (2k) and 3 files are changed: backend/utils/fmgr/fmgr.c, backend/utils/Gen_fmgrtab.sh.in, and include/access/tupdesc.h. In C++, you get a multiply defined symbol because the variable (FmgrInfo *fmgr_pl_finfo) is defined in the header (the patch moves it to the .c file). The other problem in tupdesc.h is the use of typeid is a problem in c++ (I renamed it to oidtypeid). Thanks, Neal Norwitz --- src/include/access/tupdesc.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/include') diff --git a/src/include/access/tupdesc.h b/src/include/access/tupdesc.h index dbdc27931a..662842cf45 100644 --- a/src/include/access/tupdesc.h +++ b/src/include/access/tupdesc.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: tupdesc.h,v 1.28 2000/04/12 17:16:26 momjian Exp $ + * $Id: tupdesc.h,v 1.29 2000/05/22 02:34:23 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -68,7 +68,7 @@ extern bool equalTupleDescs(TupleDesc tupdesc1, TupleDesc tupdesc2); extern bool TupleDescInitEntry(TupleDesc desc, AttrNumber attributeNumber, char *attributeName, - Oid typeid, + Oid oidtypeid, int32 typmod, int attdim, bool attisset); -- cgit v1.2.1