Commit712e77e

committed

Various fixes for string.h vs strings.h

From: Frank Ridderbusch <ridderbusch.pad@sni.de>

1 parent18e1f03 commit712e77eCopy full SHA for 712e77e

File tree

+231

-172

lines changed

+231

-172

lines changed

Lines changed: 13 additions & 10 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/libpq/pqcomm.c,v 1.37 1998/02/19 14:27:33 scrappy Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/libpq/pqcomm.c,v 1.38 1998/02/24 04:01:53 scrappy Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -34,9 +34,14 @@`
`34`	`34`	`*the postgres backend.`
`35`	`35`	`*`
`36`	`36`	`*/`
	`37`	`+#include"postgres.h"`
	`38`	`+`
`37`	`39`	`#include<stdio.h>`
`38`		`-#include<string.h>`
`39`		`-#include<strings.h>`
	`40`	`+#if defined(HAVE_STRING_H)`
	`41`	`+# include<string.h>`
	`42`	`+#else`
	`43`	`+# include<strings.h>`
	`44`	`+#endif`
`40`	`45`	`#include<signal.h>`
`41`	`46`	`#include<errno.h>`
`42`	`47`	`#include<fcntl.h>`
`@@ -56,13 +61,11 @@`
`56`	`61`	`#endif/* SOMAXCONN */`
`57`	`62`	`#endif/* linux */`
`58`	`63`
`59`		`-#include<postgres.h>`
`60`		`-`
`61`		`-#include<miscadmin.h>`
`62`		`-#include<libpq/pqsignal.h>`
`63`		`-#include<libpq/auth.h>`
`64`		`-#include<libpq/libpq.h>/* where the declarations go */`
`65`		`-#include<storage/ipc.h>`
	`64`	`+#include"miscadmin.h"`
	`65`	`+#include"libpq/pqsignal.h"`
	`66`	`+#include"libpq/auth.h"`
	`67`	`+#include"libpq/libpq.h"/* where the declarations go */`
	`68`	`+#include"storage/ipc.h"`
`66`	`69`
`67`	`70`	`/* ----------------`
`68`	`71`	`*declarations`

Lines changed: 6 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,18 +1,21 @@`
`1`	`1`	`/*`
`2`	`2`	`* @(#) pg_passwd.c 1.8 09:13:16 97/07/02Y. Ichikawa`
`3`	`3`	`*/`
	`4`	`+#include"postgres.h"`
`4`	`5`
`5`	`6`	`#include<stdio.h>`
`6`	`7`	`#include<stdlib.h>`
`7`		`-#include<string.h>`
`8`		`-#include<strings.h>`
	`8`	`+#if defined(HAVE_STRING_H)`
	`9`	`+# include<string.h>`
	`10`	`+#else`
	`11`	`+# include<strings.h>`
	`12`	`+#endif`
`9`	`13`	`#include<unistd.h>`
`10`	`14`	`#include<errno.h>`
`11`	`15`	`#include<time.h>`
`12`	`16`	`#include<ctype.h>`
`13`	`17`	`#defineissaltchar(c)(isalnum(c) \|\| (c) == '.' \|\| (c) == '/')`
`14`	`18`
`15`		`-#include"postgres.h"`
`16`	`19`	`#ifdefHAVE_TERMIOS_H`
`17`	`20`	`#include<termios.h>`
`18`	`21`	`#endif`

Comments

(0)