From f79508fbc944e859a05d5c754e39f4f1d2c6c2b1 Mon Sep 17 00:00:00 2001
From: Jonas 'Sortie' Termansen <sortie@maxsi.org>
Date: Mon, 23 Sep 2013 00:43:42 +0200
Subject: [PATCH] Remove __POSIX_OBSOLETE feature macro.

---
 libc/include/features.h |  9 ---------
 libc/include/stdio.h    | 13 +------------
 libc/include/stdlib.h   |  6 +-----
 libc/include/unistd.h   |  4 ----
 libc/include/wchar.h    | 22 ----------------------
 5 files changed, 2 insertions(+), 52 deletions(-)

diff --git a/libc/include/features.h b/libc/include/features.h
index b1cf7c87..5b59caf4 100644
--- a/libc/include/features.h
+++ b/libc/include/features.h
@@ -123,15 +123,6 @@
 #define __STDC_LIMIT_MACROS
 #endif
 
-/* TODO: Improve these declarations, perhaps like they are in glibc. */
-/*#define __POSIX_NO_OBSOLETE*/
-
-#ifdef __POSIX_NO_OBSOLETE
-	#define __POSIX_OBSOLETE 999999L
-#else
-	#define __POSIX_OBSOLETE 200112L
-#endif
-
 #define __pure2 __attribute__((__const__))
 
 /* Don't provide things from standard headers that is not implemented. */
diff --git a/libc/include/stdio.h b/libc/include/stdio.h
index 370e8e5a..6bc82343 100644
--- a/libc/include/stdio.h
+++ b/libc/include/stdio.h
@@ -43,9 +43,7 @@ __BEGIN_DECLS
 typedef off_t fpos_t;
 
 /* TODO: Implement L_ctermid */
-#if __POSIX_OBSOLETE <= 200801
 #define L_tmpnam 128
-#endif
 
 /* The possibilities for the third argument to `setvbuf'. */
 #define _IOFBF 0 /* Fully buffered. */
@@ -58,9 +56,7 @@ typedef off_t fpos_t;
    do not have these restrictions. */
 
 /* Default path prefix for `tempnam' and `tmpnam'. */
-#if __POSIX_OBSOLETE <= 200801
 #define P_tmpdir "/tmp"
-#endif
 
 extern FILE* stdin;
 extern FILE* stdout;
@@ -123,6 +119,7 @@ extern int sprintf(char* __restrict s, const char* __restrict format, ...);
 extern int scanf(const char* __restrict format, ...);
 extern int sscanf(const char* __restrict s, const char* __restrict format, ...);
 extern FILE* tmpfile(void);
+extern char* tmpnam(char* s);
 extern int ungetc(int c, FILE* stream);
 extern int vdprintf(int fildes, const char* __restrict format, __gnuc_va_list ap);
 extern int vfprintf(FILE* __restrict stream, const char* __restrict format, __gnuc_va_list ap);
@@ -133,10 +130,6 @@ extern int vsnprintf(char* __restrict, size_t, const char* __restrict, __gnuc_va
 extern int vsprintf(char* __restrict s, const char* __restrict format, __gnuc_va_list ap);
 extern int vsscanf(const char* __restrict s, const char* __restrict format, __gnuc_va_list arg);
 
-#if __POSIX_OBSOLETE <= 200801
-extern char* tmpnam(char* s);
-#endif
-
 /* TODO: These are not implemented in sortix libc yet. */
 #if defined(__SORTIX_SHOW_UNIMPLEMENTED)
 extern char* ctermid(char* s);
@@ -146,10 +139,6 @@ extern int getchar_unlocked(void);
 extern int getc_unlocked(FILE* stream);
 extern int putchar_unlocked(int c);
 extern int putc_unlocked(int c, FILE* steam);
-
-#if __POSIX_OBSOLETE <= 200801
-extern char* tempnam(const char* dir, const char* pfx);
-#endif
 #endif
 
 #if defined(_SORTIX_SOURCE)
diff --git a/libc/include/stdlib.h b/libc/include/stdlib.h
index a8aab846..57a74c5e 100644
--- a/libc/include/stdlib.h
+++ b/libc/include/stdlib.h
@@ -144,17 +144,13 @@ int posix_memalign(void**, size_t, size_t);
 int posix_openpt(int);
 char* ptsname(int);
 long random(void);
+int rand_r(unsigned *);
 unsigned short *seed48(unsigned short [3]);
 void setkey(const char*);
 char* setstate(char*);
 void srand48(long);
 void srandom(unsigned);
 int unlockpt(int);
-
-#if __POSIX_OBSOLETE <= 200801
-int rand_r(unsigned *);
-#endif
-
 #endif
 
 __END_DECLS
diff --git a/libc/include/unistd.h b/libc/include/unistd.h
index 00f93bc7..fbdfc00a 100644
--- a/libc/include/unistd.h
+++ b/libc/include/unistd.h
@@ -285,10 +285,6 @@ int symlink(const char*, const char*);
 int symlinkat(const char*, int, const char*);
 void sync(void);
 int ttyname_r(int, char*, size_t);
-
-#if __POSIX_OBSOLETE <= 200801
-pid_t setpgrp(void);
-#endif
 #endif
 
 int access(const char*, int);
diff --git a/libc/include/wchar.h b/libc/include/wchar.h
index d800cdc1..1ecc2940 100644
--- a/libc/include/wchar.h
+++ b/libc/include/wchar.h
@@ -55,10 +55,6 @@ __BEGIN_DECLS
 	#define __mbstate_t_defined 1
 #endif
 
-#if __POSIX_OBSOLETE <= 200809L
-@include(wctype_t.h)
-#endif
-
 struct tm;
 
 size_t mbsrtowcs(wchar_t* __restrict, const char** __restrict, size_t, mbstate_t* __restrict);
@@ -127,24 +123,6 @@ wint_t getwchar(void);
 wint_t putwchar(wchar_t);
 wint_t putwc(wchar_t, FILE*);
 wint_t ungetwc(wint_t, FILE*);
-
-#if __POSIX_OBSOLETE <= 200809L
-int iswalnum(wint_t);
-int iswalpha(wint_t);
-int iswcntrl(wint_t);
-int iswctype(wint_t, wctype_t);
-int iswdigit(wint_t);
-int iswgraph(wint_t);
-int iswlower(wint_t);
-int iswprint(wint_t);
-int iswpunct(wint_t);
-int iswspace(wint_t);
-int iswupper(wint_t);
-int iswxdigit(wint_t);
-wint_t towlower(wint_t);
-wint_t towupper(wint_t);
-wctype_t wctype(const char *);
-#endif
 #endif
 
 __END_DECLS