svn commit: trunk/uClibc: include libc/sysdeps/linux/common/bits

[vapier at uclibc.org]

Author: vapier
Date: 2005-11-14 17:28:16 -0800 (Mon, 14 Nov 2005)
New Revision: 12249

Log:
as psm points out, we need to use bits/getopt.h in unistd.h since getopt.h wont exist if user disables the option

Modified:
   trunk/uClibc/include/getopt.h
   trunk/uClibc/include/unistd.h
   trunk/uClibc/libc/sysdeps/linux/common/bits/getopt.h


Changeset:
Modified: trunk/uClibc/include/getopt.h
===================================================================
--- trunk/uClibc/include/getopt.h	2005-11-15 01:17:02 UTC (rev 12248)
+++ trunk/uClibc/include/getopt.h	2005-11-15 01:28:16 UTC (rev 12249)
@@ -1,5 +1,4 @@
 /* This file will not be installed if not using gnu getopt. */
 
-#include <features.h>
 #include <bits/getopt.h>
 

Modified: trunk/uClibc/include/unistd.h
===================================================================
--- trunk/uClibc/include/unistd.h	2005-11-15 01:17:02 UTC (rev 12248)
+++ trunk/uClibc/include/unistd.h	2005-11-15 01:28:16 UTC (rev 12249)
@@ -782,7 +782,7 @@
    arguments in ARGV (ARGC of them, minus the program name) for
    options given in OPTS.  */
 # define __need_getopt
-# include <getopt.h>
+# include <bits/getopt.h>
 #endif
 
 

Modified: trunk/uClibc/libc/sysdeps/linux/common/bits/getopt.h
===================================================================
--- trunk/uClibc/libc/sysdeps/linux/common/bits/getopt.h	2005-11-15 01:17:02 UTC (rev 12248)
+++ trunk/uClibc/libc/sysdeps/linux/common/bits/getopt.h	2005-11-15 01:28:16 UTC (rev 12249)
@@ -20,6 +20,8 @@
 
 #ifndef _GETOPT_H
 
+#include <features.h>
+
 #ifndef __need_getopt
 # define _GETOPT_H 1
 #endif