Commit4fa90e3

committed

More cleanups

1 parent466f5fd commit4fa90e3Copy full SHA for 4fa90e3

File tree

+28

-52

lines changed

+28

-52

lines changed

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,14 +4,15 @@`
`4`	`4`	`# Makefile for access/index`
`5`	`5`	`#`
`6`	`6`	`# IDENTIFICATION`
`7`		`-# $Header: /cvsroot/pgsql/src/backend/access/index/Makefile,v 1.2 1996/10/31 08:32:20 scrappy Exp $`
	`7`	`+# $Header: /cvsroot/pgsql/src/backend/access/index/Makefile,v 1.3 1996/11/05 10:02:01 scrappy Exp $`
`8`	`8`	`#`
`9`	`9`	`#-------------------------------------------------------------------------`
`10`	`10`
`11`	`11`	`SRCDIR = ../../..`
`12`	`12`	`include ../../../Makefile.global`
`13`	`13`
`14`		`-INCLUDE_OPT = -I../../port/$(PORTNAME)\`
	`14`	`+INCLUDE_OPT = -I../..\`
	`15`	`+ -I../../port/$(PORTNAME)\`
`15`	`16`	`-I../../../include`
`16`	`17`
`17`	`18`	`CFLAGS+=$(INCLUDE_OPT)`

Lines changed: 6 additions & 14 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/access/index/genam.c,v 1.5 1996/11/03 12:35:02 scrappy Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/access/index/genam.c,v 1.6 1996/11/05 10:02:02 scrappy Exp $`
`11`	`11`	`*`
`12`	`12`	`* NOTES`
`13`	`13`	`* many of the old access method routines have been turned into`
`@@ -44,26 +44,18 @@`
`44`	`44`	`* ----------------------------------------------------------------`
`45`	`45`	`*/`
`46`	`46`
`47`		`-#include"postgres.h"`
	`47`	`+#include<postgres.h>`
`48`	`48`
`49`		`-#include"access/relscan.h"`
`50`		`-#include"access/itup.h"`
`51`		`-#include"access/sdir.h"`
`52`		`-`
`53`		`-#include"utils/catcache.h"`
`54`		`-`
`55`		`-#include"access/genam.h"`
`56`		`-`
`57`		`-#include"utils/palloc.h"`
	`49`	`+#include<utils/catcache.h>`
	`50`	`+#include<access/genam.h>`
	`51`	`+#include<storage/bufmgr.h>`
`58`	`52`
`59`	`53`	`#ifndefHAVE_MEMMOVE`
`60`		`-# include"regex/utils.h"`
	`54`	`+# include<regex/utils.h>`
`61`	`55`	`#else`
`62`	`56`	`# include<string.h>`
`63`	`57`	`#endif`
`64`	`58`
`65`		`-#include"storage/bufmgr.h"`
`66`		`-`
`67`	`59`	`/* ----------------------------------------------------------------`
`68`	`60`	`*general access method routines`
`69`	`61`	`*`

Lines changed: 7 additions & 13 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/access/index/indexam.c,v 1.6 1996/11/03 22:57:36 scrappy Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/access/index/indexam.c,v 1.7 1996/11/05 10:02:03 scrappy Exp $`
`11`	`11`	`*`
`12`	`12`	`* INTERFACE ROUTINES`
`13`	`13`	`*index_open - open an index relation by relationId`
`@@ -63,19 +63,13 @@`
`63`	`63`	`*-------------------------------------------------------------------------`
`64`	`64`	`*/`
`65`	`65`
`66`		`-#include"postgres.h"`
	`66`	`+#include<postgres.h>`
`67`	`67`
`68`		`-#include"access/genam.h"`
`69`		`-`
`70`		`-#include"utils/relcache.h"`
`71`		`-`
`72`		`-#include"fmgr.h"`
`73`		`-`
`74`		`-#include"utils/palloc.h"`
`75`		`-`
`76`		`-#include"storage/lmgr.h"`
`77`		`-`
`78`		`-#include"access/heaptuple.h"`
	`68`	`+#include<access/genam.h>`
	`69`	`+#include<utils/relcache.h>`
	`70`	`+#include<fmgr.h>`
	`71`	`+#include<storage/lmgr.h>`
	`72`	`+#include<access/heaptuple.h>`
`79`	`73`
`80`	`74`	`/* ----------------`
`81`	`75`	`* undefine macros we aren't going to use that would otherwise`

Lines changed: 12 additions & 23 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,34 +8,23 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/backend/access/index/Attic/istrat.c,v 1.6 1996/11/03 22:57:40 scrappy Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/access/index/Attic/istrat.c,v 1.7 1996/11/05 10:02:06 scrappy Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`15`	`15`
`16`		`-#include"postgres.h"`
	`16`	`+#include<postgres.h>`
`17`	`17`
`18`		`-#include"access/relscan.h"`
`19`		`-`
`20`		`-#include"catalog/pg_proc.h"`
`21`		`-`
`22`		`-#include"catalog/pg_operator.h"`
`23`		`-`
`24`		`-#include"catalog/catname.h"`
`25`		`-`
`26`		`-#include"catalog/pg_index.h"`
`27`		`-`
`28`		`-#include"catalog/pg_amop.h"`
`29`		`-`
`30`		`-#include"catalog/pg_amproc.h"`
`31`		`-`
`32`		`-#include"utils/memutils.h"/* could have been access/itup.h */`
`33`		`-`
`34`		`-#include"access/heapam.h"`
`35`		`-`
`36`		`-#include"access/istrat.h"`
`37`		`-`
`38`		`-#include"fmgr.h"`
	`18`	`+#include<catalog/pg_proc.h>`
	`19`	`+#include<catalog/pg_operator.h>`
	`20`	`+#include<catalog/catname.h>`
	`21`	`+#include<catalog/pg_index.h>`
	`22`	`+#include<catalog/pg_amop.h>`
	`23`	`+#include<catalog/pg_amproc.h>`
	`24`	`+#include<utils/memutils.h>/* could have been access/itup.h */`
	`25`	`+#include<access/heapam.h>`
	`26`	`+#include<access/istrat.h>`
	`27`	`+#include<fmgr.h>`
`39`	`28`
`40`	`29`	`/* ----------------------------------------------------------------`
`41`	`30`	`* misc strategy support routines`

Comments

(0)