Revert previous. This mess of ifdefs needs to be killed.

This commit is contained in:
christos 2007-11-06 22:08:51 +00:00
parent b7235be3f9
commit b3b90d7485

View File

@ -1,4 +1,4 @@
/* $NetBSD: getopt_long.c,v 1.22 2007/11/06 19:13:16 christos Exp $ */
/* $NetBSD: getopt_long.c,v 1.23 2007/11/06 22:08:51 christos Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@ -33,14 +33,9 @@
#include "nbtool_config.h"
#endif
#if HAVE_NBTOOL_CONFIG_H && !HAVE_GETOPT_LONG && !HAVE_DECL_OPTIND
#define REPLACE_GETOPT
#endif
#ifdef REPLACE_GETOPT
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
__RCSID("$NetBSD: getopt_long.c,v 1.22 2007/11/06 19:13:16 christos Exp $");
__RCSID("$NetBSD: getopt_long.c,v 1.23 2007/11/06 22:08:51 christos Exp $");
#endif /* LIBC_SCCS and not lint */
#include "namespace.h"
@ -56,6 +51,11 @@ __RCSID("$NetBSD: getopt_long.c,v 1.22 2007/11/06 19:13:16 christos Exp $");
#include <stdlib.h>
#include <string.h>
#if HAVE_NBTOOL_CONFIG_H && !HAVE_GETOPT_LONG && !HAVE_DECL_OPTIND
#define REPLACE_GETOPT
#endif
#ifdef REPLACE_GETOPT
#ifdef __weak_alias
__weak_alias(getopt,_getopt)
#endif