*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.576 2009/03/04 13:56:40 heikki Exp $
+ * $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.577 2009/04/05 04:19:58 tgl Exp $
*
* NOTES
*
opterr;
#ifdef HAVE_INT_OPTRESET
-extern int optreset;
+extern int optreset; /* might not be declared by system headers */
#endif
/*
* Portions Copyright (c) 1994, Regents of the University of California
* Portions taken from FreeBSD.
*
- * $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.169 2009/03/31 18:58:16 mha Exp $
+ * $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.170 2009/04/05 04:19:58 tgl Exp $
*
*-------------------------------------------------------------------------
*/
#include "getopt_long.h"
#include "miscadmin.h"
-#ifndef HAVE_INT_OPTRESET
-int optreset;
-#endif
-
/*
* these values are passed in by makefile defines
*
* Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
*
- * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.109 2009/02/25 13:03:06 petere Exp $
+ * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.110 2009/04/05 04:19:58 tgl Exp $
*
*-------------------------------------------------------------------------
*/
#undef WIN32
#endif
-#ifndef HAVE_INT_OPTRESET
-int optreset;
-#endif
-
/* PID can be negative for standalone backend */
typedef long pgpid_t;
* by PostgreSQL
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/bin/pg_dump/pg_dump.c,v 1.532 2009/04/01 18:54:27 tgl Exp $
+ * $PostgreSQL: pgsql/src/bin/pg_dump/pg_dump.c,v 1.533 2009/04/05 04:19:58 tgl Exp $
*
*-------------------------------------------------------------------------
*/
#include "getopt_long.h"
-#ifndef HAVE_INT_OPTRESET
-int optreset;
-#endif
-
#include "access/attnum.h"
#include "access/sysattr.h"
#include "catalog/pg_cast.h"
* Portions Copyright (c) 1994, Regents of the University of California
*
*
- * $PostgreSQL: pgsql/src/bin/pg_dump/pg_dumpall.c,v 1.120 2009/03/22 16:44:26 tgl Exp $
+ * $PostgreSQL: pgsql/src/bin/pg_dump/pg_dumpall.c,v 1.121 2009/04/05 04:19:58 tgl Exp $
*
*-------------------------------------------------------------------------
*/
#include "getopt_long.h"
-#ifndef HAVE_INT_OPTRESET
-int optreset;
-#endif
-
#include "dumputils.h"
#include "pg_backup.h"
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/bin/pg_dump/pg_restore.c,v 1.96 2009/03/20 09:21:09 petere Exp $
+ * $PostgreSQL: pgsql/src/bin/pg_dump/pg_restore.c,v 1.97 2009/04/05 04:19:58 tgl Exp $
*
*-------------------------------------------------------------------------
*/
extern char *optarg;
extern int optind;
-#ifndef HAVE_INT_OPTRESET
-int optreset;
-#endif
-
#ifdef ENABLE_NLS
#include <locale.h>
#endif
*
* Copyright (c) 2000-2009, PostgreSQL Global Development Group
*
- * $PostgreSQL: pgsql/src/bin/psql/startup.c,v 1.155 2009/02/26 16:02:38 petere Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/startup.c,v 1.156 2009/04/05 04:19:58 tgl Exp $
*/
#include "postgres_fe.h"
#include "getopt_long.h"
-#ifndef HAVE_INT_OPTRESET
-int optreset;
-#endif
-
#include <locale.h>
-
#include "command.h"
#include "common.h"
#include "describe.h"
* Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $PostgreSQL: pgsql/src/bin/scripts/common.c,v 1.35 2009/02/26 16:02:38 petere Exp $
+ * $PostgreSQL: pgsql/src/bin/scripts/common.c,v 1.36 2009/04/05 04:19:59 tgl Exp $
*
*-------------------------------------------------------------------------
*/
static void SetCancelConn(PGconn *conn);
static void ResetCancelConn(void);
-#ifndef HAVE_INT_OPTRESET
-int optreset;
-#endif
-
static PGcancel *volatile cancelConn = NULL;
#ifdef WIN32
*
* Copyright (c) 2003-2009, PostgreSQL Global Development Group
*
- * $PostgreSQL: pgsql/src/bin/scripts/common.h,v 1.22 2009/02/26 16:02:39 petere Exp $
+ * $PostgreSQL: pgsql/src/bin/scripts/common.h,v 1.23 2009/04/05 04:19:59 tgl Exp $
*/
#ifndef COMMON_H
#define COMMON_H
#include "getopt_long.h"
#include "pqexpbuffer.h"
-#ifndef HAVE_INT_OPTRESET
-extern int optreset;
-#endif
-
enum trivalue
{
TRI_DEFAULT,
*
* Portions Copyright (c) 2003-2009, PostgreSQL Global Development Group
*
- * $PostgreSQL: pgsql/src/include/getopt_long.h,v 1.10 2009/01/01 17:23:55 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/getopt_long.h,v 1.11 2009/04/05 04:19:59 tgl Exp $
*/
#ifndef GETOPT_LONG_H
#define GETOPT_LONG_H
extern int optind;
extern int optopt;
extern char *optarg;
-
-/* Some systems have this, otherwise you need to define it somewhere. */
extern int optreset;
#ifndef HAVE_STRUCT_OPTION
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $PostgreSQL: pgsql/src/port/getopt_long.c,v 1.6 2007/03/26 21:44:11 momjian Exp $
+ * $PostgreSQL: pgsql/src/port/getopt_long.c,v 1.7 2009/04/05 04:19:59 tgl Exp $
*/
#include "c.h"
#ifndef HAVE_INT_OPTRESET
int optreset;
+/* else the "extern" was provided by getopt_long.h */
#endif
#define BADCH '?'