Allow /contrib include files to compile on their own.

contrib/intarray/_int.h

@@ -1,3 +1,6 @@
+#ifndef ___INT_H__
+#define ___INT_H__
+
 #include "postgres.h"
 
 #include <float.h>
@@ -171,3 +174,5 @@ int			compDESC(const void *a, const void *b);
 if (ARRNELEMS(a) > 1)											\
 		qsort((void*)ARRPTR(a), ARRNELEMS(a),sizeof(int4),		\
 				(direction) ? compASC : compDESC )
+
+#endif

contrib/pgcrypto/pgcrypto.h

@@ -26,12 +26,14 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $PostgreSQL: pgsql/contrib/pgcrypto/pgcrypto.h,v 1.8 2003/11/29 22:39:28 pgsql Exp $
+ * $PostgreSQL: pgsql/contrib/pgcrypto/pgcrypto.h,v 1.9 2006/07/10 22:06:11 momjian Exp $
  */
 
 #ifndef _PG_CRYPTO_H
 #define _PG_CRYPTO_H
 
+#include "fmgr.h"
+
 /* exported functions */
 Datum		pg_digest(PG_FUNCTION_ARGS);
 Datum		pg_digest_exists(PG_FUNCTION_ARGS);

contrib/tablefunc/tablefunc.h

@@ -31,6 +31,8 @@
 #ifndef TABLEFUNC_H
 #define TABLEFUNC_H
 
+#include "fmgr.h"
+
 /*
  * External declarations
  */

contrib/tsearch2/common.h

@@ -1,11 +1,9 @@
 #ifndef __TS_COMMON_H__
 #define __TS_COMMON_H__
+
 #include "postgres.h"
 #include "fmgr.h"
-
+#include "utils/array.h"
-#ifndef PG_NARGS
-#define PG_NARGS() (fcinfo->nargs)
-#endif
 
 text	   *char2text(char *in);
 text	   *charl2text(char *in, int len);

contrib/tsearch2/query.h

@@ -48,7 +48,7 @@ typedef struct
 #define CLOSE			5
 #define VALSTOP			6		/* for stop words */
 
-bool TS_execute(ITEM * curitem, void *checkval,
+bool TS_execute(ITEM *curitem, void *checkval,
-		   bool calcnot, bool (*chkcond) (void *checkval, ITEM * val));
+		   bool calcnot, bool (*chkcond) (void *checkval, ITEM *val));
 
 #endif

contrib/tsearch2/query_cleanup.h

@@ -1,7 +1,9 @@
 #ifndef __REWRITE_H__
 #define __REWRITE_H__
 
-ITEM	   *clean_NOT_v2(ITEM * ptr, int4 *len);
+#include "query.h"
-ITEM	   *clean_fakeval_v2(ITEM * ptr, int4 *len);
+
+ITEM	   *clean_NOT_v2(ITEM *ptr, int4 *len);
+ITEM	   *clean_fakeval_v2(ITEM *ptr, int4 *len);
 
 #endif

contrib/tsearch2/query_util.h

@@ -5,6 +5,7 @@
 #include "utils/memutils.h"
 
 #include "query.h"
+#include "executor/spi.h"
 
 typedef struct QTNode
 {

contrib/tsearch2/snowball/header.h

@@ -1,10 +1,10 @@
-/* $PostgreSQL: pgsql/contrib/tsearch2/snowball/header.h,v 1.7 2006/03/11 04:38:30 momjian Exp $ */
+/* $PostgreSQL: pgsql/contrib/tsearch2/snowball/header.h,v 1.8 2006/07/10 22:06:11 momjian Exp $ */
 
 #include <limits.h>
 
 #include "api.h"
 
-#define HEAD 2*sizeof(int)
+#define HEAD (2 * sizeof(int))
 
 #define SIZE(p)		   ((int *)(p))[-1]
 #define SET_SIZE(p, n) ((int *)(p))[-1] = n

contrib/tsearch2/ts_stat.h

@@ -7,6 +7,7 @@
 #include "access/itup.h"
 #include "utils/builtins.h"
 #include "storage/bufpage.h"
+#include "tsvector.h"
 
 typedef struct
 {

contrib/userlock/user_locks.h

@@ -1,6 +1,8 @@
 #ifndef USER_LOCKS_H
 #define USER_LOCKS_H
 
+#include "storage/lock.h"
+
 extern int	user_lock(uint32 id1, uint32 id2, LOCKMODE lockmode);
 extern int	user_unlock(uint32 id1, uint32 id2, LOCKMODE lockmode);
 extern int	user_write_lock(uint32 id1, uint32 id2);