*** pgsql.orig.2ecfaec29a72/src/port/getopt.c	2009-03-30 22:06:31.183510859 +0200
--- pgsql.orig/src/port/getopt.c	2009-03-30 21:34:04.697048053 +0200
***************
*** 36,47 ****
  static char sccsid[] = "@(#)getopt.c	8.3 (Berkeley) 4/27/95";
  #endif   /* LIBC_SCCS and not lint */
  
! 
! int			opterr = 1,			/* if error message should be printed */
! 			optind = 1,			/* index into parent argv vector */
! 			optopt,				/* character checked for validity */
! 			optreset;			/* reset getopt */
  char	   *optarg;				/* argument associated with option */
  
  #define BADCH	(int)'?'
  #define BADARG	(int)':'
--- 36,52 ----
  static char sccsid[] = "@(#)getopt.c	8.3 (Berkeley) 4/27/95";
  #endif   /* LIBC_SCCS and not lint */
  
! /* In situation when we use getopt_long from libc, we needs to use libc variable,
!  * else it causes symbol overriding and optind contains nonsens. 
!  */ 
! #ifndef HAVE_GETOPT_LONG
! int			opterr = 1;			/* if error message should be printed */
! int			optind = 1;			/* index into parent argv vector */
! int			optopt;				/* character checked for validity */
  char	   *optarg;				/* argument associated with option */
+ #endif
+ static int	optreset;			/* reset getopt */
+ 
  
  #define BADCH	(int)'?'
  #define BADARG	(int)':'