Return-Path: owner-postman 
Delivery-Date: Fri, 08 Apr 94 14:44:49 -0700
Return-Path: owner-postman
Received: from localhost (localhost [127.0.0.1]) by nobozo.CS.Berkeley.EDU (8.6.4/8.6.3) with SMTP id JAA29895 for postgres-redist; Fri, 8 Apr 1994 09:36:30 -0700
Resent-From: POSTGRES mailing list <postman@postgres.Berkeley.EDU>
Resent-Message-Id: <199404081636.JAA29895@nobozo.CS.Berkeley.EDU>
X-Authentication-Warning: nobozo.CS.Berkeley.EDU: Host localhost didn't use HELO protocol
Sender: owner-postman@postgres.Berkeley.EDU
X-Return-Path: owner-postman
Received: from mailgzrz.TU-Berlin.DE (mailgzrz.TU-Berlin.DE [130.149.4.10]) by nobozo.CS.Berkeley.EDU (8.6.4/8.6.3) with SMTP id JAA29830 for <postgres@postgres.berkeley.edu>; Fri, 8 Apr 1994 09:30:00 -0700
Received: from marie.physik.TU-Berlin.DE by mailgzrz.TU-Berlin.DE (5.65c/ZRZ-MX)
          for <postgres@postgres.berkeley.edu>
	  id AA24738; Fri, 8 Apr 1994 16:57:48 +0200
Received: by marie.physik.tu-berlin.de (5.0/SMI-SVR4)
	id AA07952; Fri, 8 Apr 1994 16:55:05 --100
From: wpp@marie.physik.tu-berlin.de (Kai Petzke)
Message-Id: <9404081455.AA07952@marie.physik.tu-berlin.de>
Subject: small header problem with Postgres for Linux
To: linux-activists@joker.cs.hut.fi
Date: Thu, 7 Apr 1994 12:17:48 +0200 (MET DST)
Cc: postgres@postgres.Berkeley.EDU
X-Mn-Key: POSTGRES
X-Mailer: ELM [version 2.4 PL23]
Content-Type: text
Content-Length: 1310
Resent-To: postgres-redist@postgres.Berkeley.EDU
Resent-Date: Fri, 08 Apr 94 09:36:29 -0700
Resent-XMts: smtp

Hi,


There is a small problem with postgres-v4r2.beta.1 for Linux.  It
is caused by different declarations of the functions aclitemin(),
aclitemout(), aclinsert(), aclremove() and aclcontains() in
the header files src/backend/utils/builtins.h and tmp/acl.h.
With the changed parser routines, the file src/backend/parser/ylib.c
includes both of them -- and bang, GCC complains about the different
declarations.


For a fast fix, see the patch below.


Kai



--- src/backend/utils/builtins.h.old	Sat Apr  2 00:44:09 1994
+++ src/backend/utils/builtins.h	Thu Apr  7 12:03:52 1994
@@ -612,11 +612,16 @@
 extern void to_basename ARGS((char *fname, char *bname, char *tname));
 
 /* acl.c */
-/* public interfaces only -- these are fake, the real ones are in tmp/acl.h */
+/*
+ * public interfaces only -- these are fake, the real ones are in tmp/acl.h.
+ * Don't  define these here, if tmp/acl.h has already been included!
+ */
+#ifndef AclHIncluded
 extern struct varlena *aclitemin ARGS((char *s));
 extern char *aclitemout ARGS((struct varlena *s));
 extern struct varlena *aclinsert ARGS((struct varlena *acl, char *aclitem));
 extern struct varlena *aclremove ARGS((struct varlena *acl, char *aclitem));
 extern int aclcontains ARGS((struct varlena *acl, char *aclitem));
+#endif
 
 #endif !BuiltinsIncluded


