38 lines
1.2 KiB
C
38 lines
1.2 KiB
C
|
$NetBSD: patch-src_common_compat__getopt.h,v 1.1 2012/11/30 14:44:35 gdt Exp $
|
||
|
|
|
||
|
|
NetBSD has getopt_long but not getopt_long_only. Replacing
|
||
|
|
getopt_long causes a type conflict with the built-in implementation.
|
||
|
|
The replacement is unnecesssary because getopt_long_only is not
|
||
|
|
actually used.
|
||
|
|
|
||
|
|
Reported upstream:
|
||
|
|
https://www.opensc-project.org/pipermail/opensc-devel/2012-November/018668.html
|
||
|
|
|
||
|
|
--- src/common/compat_getopt.h.orig 2011-07-05 11:28:53.000000000 +0000
|
||
|
|
+++ src/common/compat_getopt.h
|
||
|
|
@@ -30,7 +30,7 @@
|
||
|
|
#include "config.h"
|
||
|
|
#endif
|
||
|
|
|
||
|
|
-#if defined(HAVE_GETOPT_H) && defined(HAVE_GETOPT_LONG) && defined(HAVE_GETOPT_LONG_ONLY)
|
||
|
|
+#if defined(HAVE_GETOPT_H) && defined(HAVE_GETOPT_LONG)
|
||
|
|
#include <getopt.h>
|
||
|
|
#else
|
||
|
|
|
||
|
|
@@ -43,7 +43,6 @@ extern "C" {
|
||
|
|
|
||
|
|
#define getopt my_getopt
|
||
|
|
#define getopt_long my_getopt_long
|
||
|
|
-#define getopt_long_only my_getopt_long_only
|
||
|
|
#define _getopt_internal _my_getopt_internal
|
||
|
|
#define opterr my_opterr
|
||
|
|
#define optind my_optind
|
||
|
|
@@ -86,6 +85,6 @@ extern int _my_getopt_internal(int argc,
|
||
|
|
}
|
||
|
|
#endif
|
||
|
|
|
||
|
|
-#endif /* HAVE_GETOPT_H && HAVE_GETOPT_LONG && HAVE_GETOPT_LONG_ONLY */
|
||
|
|
+#endif /* HAVE_GETOPT_H && HAVE_GETOPT_LONG */
|
||
|
|
|
||
|
|
#endif /* MY_GETOPT_H_INCLUDED */
|