JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

(getopt): Allow full prototype when builind under FreeBSD.

Browse Source
This commit is contained in:
Nick Clifton
2005-03-23 14:46:13 +00:00
parent bade737e45
commit 7e71a4c1a0
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/ChangeLog
View File

@@ -1,3 +1,8 @@
2005-03-23 Vladimir Merzliakov <wanderer@rsu.ru>
* getopt.h (getopt): Allow full prototype when builind under
FreeBSD.
2005-03-22 Kaveh R. Ghazi <ghazi@caip.rutgers.edu> 2005-03-22 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
* libiberty.h (make_relative_prefix): Add ATTRIBUTE_MALLOC. * libiberty.h (make_relative_prefix): Add ATTRIBUTE_MALLOC.

4
include/getopt.h
View File

@@ -106,10 +106,12 @@ struct option
to find the declaration so provide a fully prototyped one. If it to find the declaration so provide a fully prototyped one. If it
is 1, we found it so don't provide any declaration at all. */ is 1, we found it so don't provide any declaration at all. */
#if !HAVE_DECL_GETOPT #if !HAVE_DECL_GETOPT
#if defined (__GNU_LIBRARY__) || defined (HAVE_DECL_GETOPT) || defined (__FreeBSD__)
#if defined (__GNU_LIBRARY__) || defined (HAVE_DECL_GETOPT) #if defined (__GNU_LIBRARY__) || defined (HAVE_DECL_GETOPT)
/* Many other libraries have conflicting prototypes for getopt, with /* Many other libraries have conflicting prototypes for getopt, with
differences in the consts, in unistd.h. To avoid compilation differences in the consts, in unistd.h. To avoid compilation
errors, only prototype getopt for the GNU C library. */ errors, only prototype getopt for environments where we know that
there will ben o conflicts. */
extern int getopt (int argc, char *const *argv, const char *shortopts); extern int getopt (int argc, char *const *argv, const char *shortopts);
#else #else
#ifndef __cplusplus #ifndef __cplusplus