summaryrefslogtreecommitdiff
path: root/misc/birthday/files/patch-getopt.h
diff options
context:
space:
mode:
authorPeter Pentchev <roam@FreeBSD.org>2002-04-11 07:47:48 +0000
committerPeter Pentchev <roam@FreeBSD.org>2002-04-11 07:47:48 +0000
commita06b809e8ab9524cb5d272d90401bfffa8f2a6b0 (patch)
treeb52a58881626feac21fcf31b1da8ea5d2451eaee /misc/birthday/files/patch-getopt.h
parentRemove texinfo (diff)
Update to 1.5.
PR: 36760 Submitted by: maintainer
Notes
Notes: svn path=/head/; revision=57565
Diffstat (limited to 'misc/birthday/files/patch-getopt.h')
-rw-r--r--misc/birthday/files/patch-getopt.h29
1 files changed, 29 insertions, 0 deletions
diff --git a/misc/birthday/files/patch-getopt.h b/misc/birthday/files/patch-getopt.h
new file mode 100644
index 000000000000..b6f814d98c83
--- /dev/null
+++ b/misc/birthday/files/patch-getopt.h
@@ -0,0 +1,29 @@
+--- getopt.h Thu Apr 4 19:15:06 2002
++++ getopt.h Thu Apr 4 19:15:32 2002
+@@ -93,15 +93,22 @@
+ optional_argument
+ };
+
++
++// Note: FreeBSD does follow the normal GNU definition for getopt, but
++// the checks below would cause it to use a new --conflicting-- definition.
++// Therefore, the checks have been commented out.
++//
++// Niek Bergboer, 04-Apr-2002
++
+ #if __STDC__
+-#if defined(__GNU_LIBRARY__)
++//#if defined(__GNU_LIBRARY__)
+ /* Many other libraries have conflicting prototypes for getopt, with
+ differences in the consts, in stdlib.h. To avoid compilation
+ errors, only prototype getopt for the GNU C library. */
+ extern int getopt (int argc, char *const *argv, const char *shortopts);
+-#else /* not __GNU_LIBRARY__ */
+-extern int getopt ();
+-#endif /* not __GNU_LIBRARY__ */
++//#else /* not __GNU_LIBRARY__ */
++//extern int getopt ();
++//#endif /* not __GNU_LIBRARY__ */
+ extern int getopt_long (int argc, char *const *argv, const char *shortopts,
+ const struct option *longopts, int *longind);
+ extern int getopt_long_only (int argc, char *const *argv,