diff options
author | Darren Tucker <dtucker@zip.com.au> | 2013-05-17 16:03:48 +1000 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2013-05-17 16:03:48 +1000 |
commit | 8654dd2d737800d09e7730b3dfc2a54411f4cf90 (patch) | |
tree | 7f002c4436ce9d5e8f339f03b453603e8f7fc76a | |
parent | 59d928d3b47e8298f4a8b4b3fb37fb8c8ce1b098 (diff) |
- (dtucker) [openbsd-compat/getopt.h] Remove unneeded bits.
-rw-r--r-- | ChangeLog | 1 | ||||
-rw-r--r-- | openbsd-compat/getopt.h | 4 |
2 files changed, 1 insertions, 4 deletions
@@ -75,6 +75,7 @@ | |||
75 | the list is DH group exchange, but that causes a bit more traffic which can | 75 | the list is DH group exchange, but that causes a bit more traffic which can |
76 | mean that the tests flip bits in the initial exchange rather than the MACed | 76 | mean that the tests flip bits in the initial exchange rather than the MACed |
77 | traffic and we get different errors to what the tests look for. | 77 | traffic and we get different errors to what the tests look for. |
78 | - (dtucker) [openbsd-compat/getopt.h] Remove unneeded bits. | ||
78 | 79 | ||
79 | 20130516 | 80 | 20130516 |
80 | - (djm) [contrib/ssh-copy-id] Fix bug that could cause "rm *" to be | 81 | - (djm) [contrib/ssh-copy-id] Fix bug that could cause "rm *" to be |
diff --git a/openbsd-compat/getopt.h b/openbsd-compat/getopt.h index 0311b078b..8eb12447e 100644 --- a/openbsd-compat/getopt.h +++ b/openbsd-compat/getopt.h | |||
@@ -33,8 +33,6 @@ | |||
33 | #ifndef _GETOPT_H_ | 33 | #ifndef _GETOPT_H_ |
34 | #define _GETOPT_H_ | 34 | #define _GETOPT_H_ |
35 | 35 | ||
36 | #include <sys/cdefs.h> | ||
37 | |||
38 | /* | 36 | /* |
39 | * GNU-like getopt_long() and 4.4BSD getsubopt()/optreset extensions | 37 | * GNU-like getopt_long() and 4.4BSD getsubopt()/optreset extensions |
40 | */ | 38 | */ |
@@ -56,7 +54,6 @@ struct option { | |||
56 | int val; | 54 | int val; |
57 | }; | 55 | }; |
58 | 56 | ||
59 | __BEGIN_DECLS | ||
60 | int getopt_long(int, char * const *, const char *, | 57 | int getopt_long(int, char * const *, const char *, |
61 | const struct option *, int *); | 58 | const struct option *, int *); |
62 | int getopt_long_only(int, char * const *, const char *, | 59 | int getopt_long_only(int, char * const *, const char *, |
@@ -73,6 +70,5 @@ extern int optopt; | |||
73 | extern int optreset; | 70 | extern int optreset; |
74 | extern char *suboptarg; /* getsubopt(3) external variable */ | 71 | extern char *suboptarg; /* getsubopt(3) external variable */ |
75 | #endif | 72 | #endif |
76 | __END_DECLS | ||
77 | 73 | ||
78 | #endif /* !_GETOPT_H_ */ | 74 | #endif /* !_GETOPT_H_ */ |