Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
packages/iperf: use libstdcpp when using eglibc.
Fix iperf Makefile to use libstdcpp instead of uclibc if compiling with eglibc toolchain. Fix gnu_getopt.h file to avoid redefining a structure when getopt.h has already been included.
- Loading branch information
xavileon
committed
Mar 26, 2012
1 parent
4c682c9
commit 1118352
Showing
2 changed files
with
37 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
--- a/include/gnu_getopt.h | ||
+++ b/include/gnu_getopt.h | ||
@@ -30,8 +30,8 @@ | ||
* $Id: gnu_getopt.h,v 1.1.1.1 2004/05/18 01:50:44 kgibbs Exp $ | ||
*/ | ||
|
||
-#ifndef _GETOPT_H | ||
- #define _GETOPT_H 1 | ||
+#ifndef _GNU_GETOPT_H | ||
+ #define _GNU_GETOPT_H 1 | ||
|
||
#ifdef __cplusplus | ||
extern "C" { | ||
@@ -92,12 +92,14 @@ extern int gnu_optopt; | ||
/* has_arg can't be an enum because some compilers complain about | ||
type mismatches in all the code that assumes it is an int. */ | ||
|
||
+#ifndef _GETOPT_H | ||
struct option { | ||
const char *name; | ||
int has_arg; | ||
int *flag; | ||
int val; | ||
}; | ||
+#endif | ||
|
||
/* Names for the values of the `has_arg' field of `struct option'. */ | ||
|
||
@@ -133,4 +135,4 @@ int _gnu_getopt_internal( int argc, | ||
} /* end extern "C" */ | ||
#endif | ||
|
||
-#endif /* _GETOPT_H */ | ||
+#endif /* _GNU_GETOPT_H */ |