Commita061a3f

committed

Avoid including <sys/time.h> on platforms that don't have it.

Per trouble report from Andreas Pflug.

1 parentfd78666 commita061a3fCopy full SHA for a061a3f

File tree

+10

-5

lines changed

+10

-5

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -6957,7 +6957,8 @@ done`
`6957`	`6957`
`6958`	`6958`
`6959`	`6959`
`6960`		`-for ac_header in crypt.h dld.h endian.h fp_class.h getopt.h ieeefp.h poll.h pwd.h sys/ipc.h sys/poll.h sys/pstat.h sys/select.h sys/sem.h sys/socket.h sys/shm.h sys/un.h termios.h utime.h wchar.h wctype.h kernel/OS.h kernel/image.h SupportDefs.h`
	`6960`	`+`
	`6961`	`+for ac_header in crypt.h dld.h endian.h fp_class.h getopt.h ieeefp.h poll.h pwd.h sys/ipc.h sys/poll.h sys/pstat.h sys/select.h sys/sem.h sys/socket.h sys/shm.h sys/time.h sys/un.h termios.h utime.h wchar.h wctype.h kernel/OS.h kernel/image.h SupportDefs.h`
`6961`	`6962`	`do`
`6962`	`6963`	as_ac_Header=`echo "ac_cv_header_$ac_header" \| $as_tr_sh`
`6963`	`6964`	`if eval "test \"\${$as_ac_Header+set}\" = set"; then`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`dnl Process this file with autoconf to produce a configure script.`
`2`		`-dnl $PostgreSQL: pgsql/configure.in,v 1.364 2004/06/16 03:01:32 momjian Exp $`
	`2`	`+dnl $PostgreSQL: pgsql/configure.in,v 1.365 2004/06/24 18:55:18 tgl Exp $`
`3`	`3`	`dnl`
`4`	`4`	`dnl Developers, please strive to achieve this order:`
`5`	`5`	`dnl`
`@@ -670,7 +670,7 @@ fi`
`670`	`670`	`##`
`671`	`671`
`672`	`672`	`dnl sys/socket.h is required by AC_FUNC_ACCEPT_ARGTYPES`
`673`		`-AC_CHECK_HEADERS([crypt.h dld.h endian.h fp_class.h getopt.h ieeefp.h poll.h pwd.h sys/ipc.h sys/poll.h sys/pstat.h sys/select.h sys/sem.h sys/socket.h sys/shm.h sys/un.h termios.h utime.h wchar.h wctype.h kernel/OS.h kernel/image.h SupportDefs.h])`
	`673`	`+AC_CHECK_HEADERS([crypt.h dld.h endian.h fp_class.h getopt.h ieeefp.h poll.h pwd.h sys/ipc.h sys/poll.h sys/pstat.h sys/select.h sys/sem.h sys/socket.h sys/shm.h sys/time.h sys/un.h termios.h utime.h wchar.h wctype.h kernel/OS.h kernel/image.h SupportDefs.h])`
`674`	`674`
`675`	`675`	`# At least on IRIX, cpp test for netinet/tcp.h will fail unless`
`676`	`676`	`# netinet/in.h is included first.`

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,15 +11,16 @@`
`11`	`11`	`* Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group`
`12`	`12`	`* Portions Copyright (c) 1994, Regents of the University of California`
`13`	`13`	`*`
`14`		`- * $PostgreSQL: pgsql/src/include/libpq/libpq-be.h,v 1.45 2004/05/21 05:08:04 tgl Exp $`
	`14`	`+ * $PostgreSQL: pgsql/src/include/libpq/libpq-be.h,v 1.46 2004/06/24 18:55:20 tgl Exp $`
`15`	`15`	`*`
`16`	`16`	`*-------------------------------------------------------------------------`
`17`	`17`	`*/`
`18`	`18`	`#ifndefLIBPQ_BE_H`
`19`	`19`	`#defineLIBPQ_BE_H`
`20`	`20`
	`21`	`+#ifdefHAVE_SYS_TIME_H`
`21`	`22`	`#include<sys/time.h>`
`22`		`-`
	`23`	`+#endif`
`23`	`24`	`#ifdefUSE_SSL`
`24`	`25`	`#include<openssl/ssl.h>`
`25`	`26`	`#include<openssl/err.h>`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -496,6 +496,9 @@`
`496`	`496`	`/* Define to 1 if you have the <sys/stat.h> header file. */`
`497`	`497`	`#undef HAVE_SYS_STAT_H`
`498`	`498`
	`499`	`+/* Define to 1 if you have the <sys/time.h> header file. */`
	`500`	`+#undef HAVE_SYS_TIME_H`
	`501`	`+`
`499`	`502`	`/* Define to 1 if you have the <sys/types.h> header file. */`
`500`	`503`	`#undef HAVE_SYS_TYPES_H`
`501`	`504`

Comments

(0)