move stdio stuff that's not arch-specific out of bits

diff --git a/arch/i386/bits/stdio.h b/arch/i386/bits/stdio.h
deleted file mode 100644 (file)
index b4611f3..0000000
--- a/arch/i386/bits/stdio.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#define BUFSIZ 1024
-
-#define FILENAME_MAX 4095
-#define FOPEN_MAX 1000
-#define TMP_MAX 10000
-
-#define L_cuserid 20
-#define L_tmpnam 20
-
-#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
- || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE)
-#define L_ctermid 20
-#endif
-
-#if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE)
-#define P_tmpdir "/tmp"
-#endif

diff --git a/arch/x86_64/bits/stdio.h b/arch/x86_64/bits/stdio.h
deleted file mode 100644 (file)
index 0afd8b4..0000000
--- a/arch/x86_64/bits/stdio.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#define BUFSIZ 1024
-
-#define FILENAME_MAX 4095
-#define FOPEN_MAX 1000
-#define TMP_MAX 10000
-
-#define L_cuserid 20
-#define L_ctermid 20
-#define L_tmpnam 20
-#define P_tmpdir "/tmp"

diff --git a/include/stdio.h b/include/stdio.h
index 7441cae..4abb1e6 100644 (file)
--- a/include/stdio.h
+++ b/include/stdio.h
@@ -38,7 +38,11 @@ extern "C" {
 #define _IOLBF 1
 #define _IONBF 2
 
 #define _IOLBF 1
 #define _IONBF 2
 

-#include <bits/stdio.h>
+#define BUFSIZ 1024
+#define FILENAME_MAX 4095
+#define FOPEN_MAX 1000
+#define TMP_MAX 10000
+#define L_tmpnam 20

 
 typedef union {
        char __opaque[16];
 
 typedef union {
        char __opaque[16];


@@ -136,14 +140,18 @@ ssize_t getdelim(char **, size_t *, int, FILE *);
 ssize_t getline(char **, size_t *, FILE *);
 int renameat(int, const char *, int, const char *);
 char *ctermid(char *);
 ssize_t getline(char **, size_t *, FILE *);
 int renameat(int, const char *, int, const char *);
 char *ctermid(char *);

+#define L_ctermid 20

 #endif
 
 
 #if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE)
 #endif
 
 
 #if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE)

+#define P_tmpdir "/tmp"

 char *tempnam(const char *, const char *);
 #endif
 
 #if defined(_GNU_SOURCE)
 char *tempnam(const char *, const char *);
 #endif
 
 #if defined(_GNU_SOURCE)

+#define L_cuserid 20
+char *cuserid(char *);

 #undef off64_t
 #define off64_t off_t
 #endif
 #undef off64_t
 #define off64_t off_t
 #endif