remove MJN only debug messages

37 files changed, 1 insertions, 491 deletions

diff --git a/Makefile.in b/Makefile.in
index 36245e38d..59656853e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -497,7 +497,6 @@ allyesconfig: $(conf)
 		-e "s/^DOASSERTS=.*/# DOASSERTS is not set/" \
 		-e "s/^SUPPORT_LD_DEBUG_EARLY=.*/# SUPPORT_LD_DEBUG_EARLY is not set/" \
 		-e "s/^SUPPORT_LD_DEBUG=.*/# SUPPORT_LD_DEBUG is not set/" \
-		-e "s/^UCLIBC_MJN3_ONLY=.*/# UCLIBC_MJN3_ONLY is not set/" \
 		$(KCONFIG_CONFIG)
 	$(Q)$< -o $(Kconfig)
 alldefconfig: $(conf)
diff --git a/extra/Configs/Config.in b/extra/Configs/Config.in
index 17ae847ce..f3494db99 100644
--- a/extra/Configs/Config.in
+++ b/extra/Configs/Config.in
@@ -1848,20 +1848,6 @@ config UCLIBC_HAS_SYS_SIGLIST
 
 	  Most people will answer N.
 
-config UCLIBC_HAS_GETTEXT_AWARENESS
-	bool "Include gettext awareness"
-	depends on UCLIBC_HAS_LOCALE && UCLIBC_MJN3_ONLY
-	help
-	  NOTE!!!  Not yet integrated with strerror and strsignal.  NOTE!!!
-
-	  Answer Y if you want to include weak stub gettext support and
-	  make the *strerror*() and strsignal() functions gettext-aware.
-
-	  Currently, to get functional gettext functionality you will need
-	  to use gnu gettext.
-
-	  Most people will answer N.
-
 config UCLIBC_HAS_GNU_GETOPT
 	bool "Support gnu getopt"
 	default y
diff --git a/extra/Configs/defconfigs/or1k/defconfig b/extra/Configs/defconfigs/or1k/defconfig
index 63d657109..a4658dace 100644
--- a/extra/Configs/defconfigs/or1k/defconfig
+++ b/extra/Configs/defconfigs/or1k/defconfig
@@ -238,4 +238,3 @@ UCLIBC_EXTRA_CFLAGS=""
 WARNINGS="-Wall"
 # EXTRA_WARNINGS is not set
 # DOMULTI is not set
-# UCLIBC_MJN3_ONLY is not set
diff --git a/include/nl_types.h b/include/nl_types.h
index cb86cf0cd..3692d0c4e 100644
--- a/include/nl_types.h
+++ b/include/nl_types.h
@@ -31,10 +31,6 @@
 
 __BEGIN_DECLS
 
-#ifdef __UCLIBC_MJN3_ONLY__
-#warning "mjn3 FIXME: None of these prototypes have implementations."
-#endif
-
 #ifndef __UCLIBC_STRICT_HEADERS__
 /* Message catalog descriptor type.  */
 typedef void *nl_catd;
diff --git a/include/time.h b/include/time.h
index a1dfdea18..785c8f665 100644
--- a/include/time.h
+++ b/include/time.h
@@ -288,16 +288,6 @@ extern char *ctime_r (const time_t *__restrict __timer,
 		      char *__restrict __buf) __THROW;
 # endif	/* POSIX or misc */
 
-
-/* Defined in localtime.c.  */
-#ifdef __UCLIBC_MJN3_ONLY__
-#warning "mjn3 FIXME: __tzname, __daylight, and __timezone have a prototype but are not defined."
-extern char *__tzname[2];	/* Current timezone names.  */
-extern int __daylight;		/* If daylight-saving time is ever in use.  */
-extern long int __timezone;	/* Seconds west of UTC.  */
-#endif /* __UCLIBC_MJN3_ONLY__ */
-
-
 # ifdef	__USE_POSIX
 /* Same as above.  */
 extern char *tzname[2];
@@ -403,49 +393,6 @@ extern int timer_getoverrun (timer_t __timerid) __THROW;
 #  endif /* __UCLIBC_HAS_REALTIME__ */
 # endif /* __USE_POSIX199309 */
 
-
-#ifdef __UCLIBC_MJN3_ONLY__
-#warning "mjn3 FIXME: a bunch of unimplemented function prototypes."
-# ifdef __USE_XOPEN_EXTENDED
-/* Set to one of the following values to indicate an error.
-     1  the DATEMSK environment variable is null or undefined,
-     2  the template file cannot be opened for reading,
-     3  failed to get file status information,
-     4  the template file is not a regular file,
-     5  an error is encountered while reading the template file,
-     6  memory allication failed (not enough memory available),
-     7  there is no line in the template that matches the input,
-     8  invalid input specification Example: February 31 or a time is
-        specified that can not be represented in a time_t (representing
-	the time in seconds since 00:00:00 UTC, January 1, 1970) */
-extern int getdate_err;
-
-/* Parse the given string as a date specification and return a value
-   representing the value.  The templates from the file identified by
-   the environment variable DATEMSK are used.  In case of an error
-   `getdate_err' is set.
-
-   This function is a possible cancellation points and therefore not
-   marked with __THROW.  */
-extern struct tm *getdate (const char *__string);
-# endif
-
-# ifdef __USE_GNU
-/* Since `getdate' is not reentrant because of the use of `getdate_err'
-   and the static buffer to return the result in, we provide a thread-safe
-   variant.  The functionality is the same.  The result is returned in
-   the buffer pointed to by RESBUFP and in case of an error the return
-   value is != 0 with the same values as given above for `getdate_err'.
-
-   This function is not part of POSIX and therefore no official
-   cancellation point.  But due to similarity with an POSIX interface
-   or due to the implementation it is a cancellation point and
-   therefore not marked with __THROW.  */
-extern int getdate_r (const char *__restrict __string,
-		      struct tm *__restrict __resbufp);
-# endif
-#endif /* __UCLIBC_MJN3_ONLY__ */
-
 __END_DECLS
 
 #endif /* <time.h> included.  */
diff --git a/include/wctype.h b/include/wctype.h
index aa133bd60..3842ccf4e 100644
--- a/include/wctype.h
+++ b/include/wctype.h
@@ -101,11 +101,6 @@ enum
   _ISwpunct = _ISwbit (__ISwpunct),	/* Punctuation.  */
   _ISwalnum = _ISwbit (__ISwalnum)	/* Alphanumeric.  */
 };
-# else
-#  if defined(__UCLIBC_MJN3_ONLY__) && defined(L_iswctype)
-#warning remove _ISwbit already defined check?
-#error _ISwbit already defined!
-#  endif
 # endif /* Not _ISwbit  */
 
 
diff --git a/libc/inet/resolv.c b/libc/inet/resolv.c
index f378c9b9d..e3ad5131f 100644
--- a/libc/inet/resolv.c
+++ b/libc/inet/resolv.c
@@ -2082,9 +2082,6 @@ int gethostbyname_r(const char *name,
 		return ERANGE;
 
 	/* we store only one "alias" - the name itself */
-#ifdef __UCLIBC_MJN3_ONLY__
-#warning TODO -- generate the full list
-#endif
 	alias[0] = alias0;
 	alias[1] = NULL;
 
@@ -2283,9 +2280,6 @@ int gethostbyname2_r(const char *name,
 		return ERANGE;
 
 	/* we store only one "alias" - the name itself */
-#ifdef __UCLIBC_MJN3_ONLY__
-#warning TODO -- generate the full list
-#endif
 	alias[0] = alias0;
 	alias[1] = NULL;
 
diff --git a/libc/misc/ctype/ctype.c b/libc/misc/ctype/ctype.c
index db8061d9f..bbe12e514 100644
--- a/libc/misc/ctype/ctype.c
+++ b/libc/misc/ctype/ctype.c
@@ -62,16 +62,7 @@
 #endif /* __UCLIBC_HAS_CTYPE_SIGNED__ */
 
 #endif /* __UCLIBC_HAS_CTYPE_TABLES__ */
-/**********************************************************************/
-#ifdef __UCLIBC_MJN3_ONLY__
-#ifdef L_isspace
-/* emit only once */
-#warning CONSIDER: Should we assert when debugging and __UCLIBC_HAS_CTYPE_CHECKED?
-#warning TODO: Fix asserts in to{upper|lower}{_l}.
-#warning TODO: Optimize the isx*() funcs.
-#endif
-#endif /* __UCLIBC_MJN3_ONLY__ */
-/**********************************************************************/
+
 #undef PASTE2
 #define PASTE2(X,Y)    X ## Y
 
diff --git a/libc/misc/error/err.c b/libc/misc/error/err.c
index 4f1e6a33f..1563450a0 100644
--- a/libc/misc/error/err.c
+++ b/libc/misc/error/err.c
@@ -12,14 +12,8 @@
 #include <errno.h>
 #include <err.h>
 
-#ifdef __UCLIBC_MJN3_ONLY__
-#warning REMINDER: Deal with wide oriented stderr case.
-#endif
-
 #if defined __USE_BSD
 
-
-
 static void vwarn_work(const char *format, va_list args, int showerr)
 {
 	/*                         0123 45678 9 a b*/
diff --git a/libc/misc/locale/locale.c b/libc/misc/locale/locale.c
index 68e54413e..f868ac022 100644
--- a/libc/misc/locale/locale.c
+++ b/libc/misc/locale/locale.c
@@ -58,11 +58,6 @@
 #include <ctype.h>
 #include <stdio.h>
 
-#ifdef __UCLIBC_MJN3_ONLY__
-#ifdef L_setlocale
-#warning TODO: Make the link_warning()s a config option?
-#endif
-#endif
 #undef link_warning
 #define link_warning(A,B)
 
@@ -78,13 +73,6 @@
 
 #else  /* __LOCALE_C_ONLY */
 
-#ifdef __UCLIBC_MJN3_ONLY__
-#ifdef L_setlocale
-#warning TODO: Fix the __CTYPE_HAS_8_BIT_LOCALES define at the top of the file.
-#warning TODO: Fix __WCHAR_ENABLED.
-#endif
-#endif
-
 /* Need to include this before locale.h! */
 #include <bits/uClibc_locale.h>
 
@@ -107,9 +95,6 @@
 #define LOCALE_AT_MODIFIERS		(__locale_mmap->locale_at_modifiers)
 #define CATEGORY_NAMES			(__locale_mmap->lc_names)
 
-#ifdef __UCLIBC_MJN3_ONLY__
-#warning REMINDER: redo the MAX_LOCALE_STR stuff...
-#endif
 #define MAX_LOCALE_STR			256 /* TODO: Only sufficient for current case. */
 #define MAX_LOCALE_CATEGORY_STR	32 /* TODO: Only sufficient for current case. */
 /* Note: Best if MAX_LOCALE_CATEGORY_STR is a power of 2. */
@@ -122,11 +107,6 @@ extern void _locale_init_l(__locale_t base) attribute_hidden;
 #undef LOCALE_STRING_SIZE
 #define LOCALE_SELECTOR_SIZE (2 * __LC_ALL + 2)
 
-#ifdef __UCLIBC_MJN3_ONLY__
-#ifdef L_setlocale
-#warning TODO: Create a C locale selector string.
-#endif
-#endif
 #define C_LOCALE_SELECTOR "\x23\x80\x80\x80\x80\x80\x80\x80\x80\x80\x80\x80\x80"
 
 
@@ -163,15 +143,9 @@ link_warning(setlocale,"REMINDER: The 'setlocale' function is _not_ threadsafe e
 #error locales enabled, but not data other than for C locale!
 #endif
 
-#ifdef __UCLIBC_MJN3_ONLY__
-#warning TODO: Move posix and utf8 strings.
-#endif
 static const char posix[] = "POSIX";
 static const char utf8[] = "UTF-8";
 
-#ifdef __UCLIBC_MJN3_ONLY__
-#warning TODO: Fix dimensions of hr_locale.
-#endif
 /* Individual category strings start at hr_locale + category * MAX_LOCALE_CATEGORY.
  * This holds for LC_ALL as well.
  */
@@ -355,9 +329,6 @@ __locale_t __curlocale_var = &__global_locale_data;
 #endif
 
 /*----------------------------------------------------------------------*/
-#ifdef __UCLIBC_MJN3_ONLY__
-#warning TODO: Move utf8 and ascii strings.
-#endif
 static const char utf8[] = "UTF-8";
 static const char ascii[] = "ASCII";
 
@@ -413,9 +384,6 @@ static int init_cur_collate(int der_num, __collate_t *cur_collate)
 	size_t n;
 	uint16_t i, w;
 
-#ifdef __UCLIBC_MJN3_ONLY__
-#warning kill of x86-specific asserts
-#endif
 #if 0
 	assert(sizeof(coldata_base_t) == 19*2);
 	assert(sizeof(coldata_der_t) == 4*2);
@@ -431,9 +399,6 @@ static int init_cur_collate(int der_num, __collate_t *cur_collate)
 
 	cdh = (coldata_header_t *) __locale_collate_tbl;
 
-#ifdef __UCLIBC_MJN3_ONLY__
-#warning CONSIDER: Should we assert here?
-#endif
 #if 0
 	if (der_num >= cdh->num_der) {
 		return 0;
@@ -492,11 +457,6 @@ static int init_cur_collate(int der_num, __collate_t *cur_collate)
 
 	cur_collate->MAX_WEIGHTS = cdh->MAX_WEIGHTS;
 
-#ifdef __UCLIBC_MJN3_ONLY__
-#warning CONSIDER: Fix the +1 by increasing max_col_index?
-#warning CONSIDER: Since this collate info is dependent only on LC_COLLATE ll_cc and not on codeset, we could just globally allocate this for each in a table
-#endif
-
 	cur_collate->index2weight = calloc(2*cur_collate->max_col_index+2,
 									   sizeof(uint16_t));
 	if (!cur_collate->index2weight) {
@@ -643,9 +603,6 @@ int attribute_hidden _locale_set_l(const unsigned char *p, __locale_t base)
 					c -= 3;
 					base->codeset = (char *) (r + r[c]);
 					base->encoding = __ctype_encoding_8_bit;
-#ifdef __UCLIBC_MJN3_ONLY__
-#warning REMINDER: update 8 bit mb_cur_max when translit implemented!
-#endif
 					/* TODO - update when translit implemented! */
 					base->mb_cur_max = 1;
 					c8b = __locale_mmap->codeset_8_bit + c;
@@ -775,9 +732,6 @@ int attribute_hidden _locale_set_l(const unsigned char *p, __locale_t base)
 
 #endif /* __CTYPE_HAS_8_BIT_LOCALES */
 				}
-#ifdef __UCLIBC_MJN3_ONLY__
-#warning TODO: Put the outdigit string length in the locale_mmap object.
-#endif
 				d = base->outdigit_length;
 				x = &base->outdigit0_mb;
 				for (c = 0 ; c < 10 ; c++) {
@@ -798,9 +752,6 @@ int attribute_hidden _locale_set_l(const unsigned char *p, __locale_t base)
 						= __locale_mbrtowc_l(&base->thousands_sep_wc,
 											 base->thousands_sep, base);
 #if 1
-#ifdef __UCLIBC_MJN3_ONLY__
-#warning TODO: Remove hack involving grouping without a thousep char (bg_BG).
-#endif
 					assert(base->thousands_sep_len >= 0);
 					if (base->thousands_sep_len == 0) {
 						base->grouping = base->thousands_sep; /* empty string */
@@ -898,9 +849,6 @@ void attribute_hidden _locale_init_l(__locale_t base)
 	__ctype_toupper = __C_ctype_toupper;
 #endif /* __UCLIBC_HAS_XLOCALE__ */
 
-#ifdef __UCLIBC_MJN3_ONLY__
-#warning TODO: Initialize code2flag correctly based on locale_mmap.
-#endif
 	base->code2flag = __code2flag;
 
 	_locale_set_l((unsigned char*) C_LOCALE_SELECTOR, base);
@@ -1056,9 +1004,6 @@ libc_hidden_def(__XL_NPP(nl_langinfo))
 
 #warning mask defines for extra locale categories
 
-#ifdef __UCLIBC_MJN3_ONLY__
-#warning TODO: Move posix and utf8 strings.
-#endif
 static const char posix[] = "POSIX";
 static const char utf8[] = "UTF-8";
 
@@ -1073,9 +1018,6 @@ static int find_locale(int category_mask, const char *p,
 #if defined(__LOCALE_DATA_AT_MODIFIERS_LENGTH) && 1
 	/* Support standard locale handling for @-modifiers. */
 
-#ifdef __UCLIBC_MJN3_ONLY__
-#warning REMINDER: Fix buf size in find_locale.
-#endif
 	char buf[18];	/* TODO: 7+{max codeset name length} */
 	const char *q;
 
@@ -1226,9 +1168,6 @@ __locale_t newlocale(int category_mask, const char *locale, __locale_t base)
 		return NULL; /* No locale or illegal/unsupported category. */
 	}
 
-#ifdef __UCLIBC_MJN3_ONLY__
-#warning TODO: Rename cur_locale to locale_selector.
-#endif
 	strcpy((char *) new_selector,
 		   (base ? (char *) base->cur_locale : C_LOCALE_SELECTOR));
 
@@ -1272,15 +1211,9 @@ __locale_t newlocale(int category_mask, const char *locale, __locale_t base)
 		goto INVALID;
 	}
 
-#ifdef __UCLIBC_MJN3_ONLY__
-#warning TODO: Do a compatible codeset check!
-#endif
 
 	/* If we get here, the new selector corresponds to a valid locale. */
 
-#ifdef __UCLIBC_MJN3_ONLY__
-#warning CONSIDER: Probably want a _locale_new func to allow for caching of locales.
-#endif
 #if 0
 	if (base) {
 		_locale_set_l(new_selector, base);
@@ -1309,10 +1242,6 @@ libc_hidden_def(newlocale)
 #ifdef L_duplocale
 
 
-#ifdef __UCLIBC_MJN3_ONLY__
-#warning REMINDER: When we allocate ctype tables, remember to dup them.
-#endif
-
 __locale_t duplocale(__locale_t dataset)
 {
 	__locale_t r;
@@ -1341,10 +1270,6 @@ __locale_t duplocale(__locale_t dataset)
 /**********************************************************************/
 #ifdef L_freelocale
 
-#ifdef __UCLIBC_MJN3_ONLY__
-#warning REMINDER: When we allocate ctype tables, remember to free them.
-#endif
-
 void freelocale(__locale_t dataset)
 {
 	assert(dataset != __global_locale);
diff --git a/libc/misc/time/time.c b/libc/misc/time/time.c
index 03635d86d..cd189169a 100644
--- a/libc/misc/time/time.c
+++ b/libc/misc/time/time.c
@@ -1033,10 +1033,6 @@ static wchar_t* fmt_to_wc_1(const char *src)
 
 #define MAX_PUSH 4
 
-#ifdef __UCLIBC_MJN3_ONLY__
-#warning TODO: Check multibyte format string validity.
-#endif
-
 size_t __XL_NPP(strftime)(CHAR_T *__restrict s, size_t maxsize,
 					  const CHAR_T *__restrict format,
 					  const struct tm *__restrict timeptr   __LOCALE_PARAM )
@@ -1871,10 +1867,6 @@ static const char *getnumber(register const char *e, int *pn)
 }
 
 
-#ifdef __UCLIBC_MJN3_ONLY__
-#warning CONSIDER: Should we preserve errno from open/read/close errors re TZ file?
-#endif
-
 #ifdef __UCLIBC_HAS_TZ_FILE__
 
 #ifndef __UCLIBC_HAS_TZ_FILE_READ_MANY__
diff --git a/libc/misc/wchar/wchar.c b/libc/misc/wchar/wchar.c
index 966f78d19..201f30772 100644
--- a/libc/misc/wchar/wchar.c
+++ b/libc/misc/wchar/wchar.c
@@ -112,12 +112,6 @@
 
 /**********************************************************************/
 #ifdef __UCLIBC_HAS_LOCALE__
-#ifdef __UCLIBC_MJN3_ONLY__
-#ifdef L_iswspace
-/* generates one warning */
-#warning TODO: Fix Cc2wc* and Cwc2c* defines!
-#endif
-#endif /* __UCLIBC_MJN3_ONLY__ */
 
 #define ENCODING		(__UCLIBC_CURLOCALE->encoding)
 
@@ -134,13 +128,6 @@
 
 #else  /* __UCLIBC_HAS_LOCALE__ */
 
-#ifdef __UCLIBC_MJN3_ONLY__
-#ifdef L_btowc
-/* emit only once */
-#warning fix preprocessor logic testing locale settings
-#endif
-#endif
-
 #define ENCODING (__ctype_encoding_7_bit)
 #ifdef __CTYPE_HAS_8_BIT_LOCALES
 #error __CTYPE_HAS_8_BIT_LOCALES is defined!
@@ -313,10 +300,6 @@ size_t mbrtowc(wchar_t *__restrict pwc, const char *__restrict s,
 	}
 #endif
 
-#ifdef __UCLIBC_MJN3_ONLY__
-#warning TODO: This adds a trailing nul!
-#endif /* __UCLIBC_MJN3_ONLY__ */
-
 	r = mbsnrtowcs(wcbuf, &p, SIZE_MAX, 1, ps);
 
 	if (((ssize_t) r) >= 0) {
@@ -339,9 +322,6 @@ libc_hidden_def(mbrtowc)
 size_t wcrtomb(register char *__restrict s, wchar_t wc,
 			   mbstate_t *__restrict ps)
 {
-#ifdef __UCLIBC_MJN3_ONLY__
-#warning TODO: Should wcsnrtombs nul-terminate unconditionally?  Check glibc.
-#endif /* __UCLIBC_MJN3_ONLY__ */
 	wchar_t wcbuf[1];
 	const wchar_t *pwc;
 	size_t r;
@@ -473,9 +453,6 @@ size_t attribute_hidden _wchar_utf8sntowcs(wchar_t *__restrict pwc, size_t wn,
 		--n;
 		if ((wc = ((unsigned char) *s++)) >= 0x80) { /* Not ASCII... */
 			mask = 0x40;
-#ifdef __UCLIBC_MJN3_ONLY__
-#warning TODO: Fix range for 16 bit wchar_t case.
-#endif
 			if (( ((unsigned char)(s[-1] - 0xc0)) < (0xfe - 0xc0) ) &&
 			(((unsigned char)s[-1] != 0xc0 ) && ((unsigned char)s[-1] != 0xc1 ))) {
 				goto START;
@@ -910,12 +887,6 @@ libc_hidden_def(wcsnrtombs)
 /**********************************************************************/
 #ifdef L_wcswidth
 
-
-#ifdef __UCLIBC_MJN3_ONLY__
-#warning REMINDER: If we start doing translit, wcwidth and wcswidth will need updating.
-#warning TODO: Update wcwidth to match latest by Kuhn.
-#endif
-
 #if defined(__UCLIBC_HAS_LOCALE__) && \
 ( defined(__CTYPE_HAS_8_BIT_LOCALES) || defined(__CTYPE_HAS_UTF_8_LOCALES) )
 
@@ -1442,9 +1413,6 @@ size_t weak_function iconv(iconv_t cd, char **__restrict inbuf,
 					}
 					return (size_t)(-1);
 				}
-#ifdef __UCLIBC_MJN3_ONLY__
-#warning TODO: optimize this.
-#endif
 				if (p != NULL) { /* incomplete char case */
 					goto INVALID;
 				}
@@ -1519,9 +1487,6 @@ size_t weak_function iconv(iconv_t cd, char **__restrict inbuf,
 			do {
 				r = _wchar_wcsntoutf8s(*outbuf, *outbytesleft, &pw, 1);
 				if (r != (size_t)(-1)) {
-#ifdef __UCLIBC_MJN3_ONLY__
-#warning TODO: What happens for a nul?
-#endif
 					if (r == 0) {
 						if (wc != 0) {
 							goto TOO_BIG;
diff --git a/libc/misc/wctype/_wctype.c b/libc/misc/wctype/_wctype.c
index 68fae8b54..81076baf1 100644
--- a/libc/misc/wctype/_wctype.c
+++ b/libc/misc/wctype/_wctype.c
@@ -93,13 +93,6 @@ enum {
 
 /*--------------------------------------------------------------------*/
 
-#ifdef __UCLIBC_MJN3_ONLY__
-# ifdef L_iswspace
-/* generates one warning */
-#  warning TODO: Fix WC* defines!
-# endif
-#endif
-
 #define ENCODING		(__UCLIBC_CURLOCALE->encoding)
 
 #define WCctype			(__UCLIBC_CURLOCALE->tblwctype)
@@ -459,10 +452,6 @@ libc_hidden_def(wctype)
 /**********************************************************************/
 #ifdef L_wctype_l
 
-#ifdef __UCLIBC_MJN3_ONLY__
-# warning REMINDER: Currently wctype_l simply calls wctype.
-#endif
-
 wctype_t wctype_l (const char *property, __locale_t locale)
 {
 	return wctype(property);
@@ -485,12 +474,6 @@ wctype_t wctype_l (const char *property, __locale_t locale)
 	    ) \
 	)
 
-#ifdef __UCLIBC_MJN3_ONLY__
-# ifdef L_iswctype
-#  warning CONSIDER: Change to bit shift?  would need to sync with wctype.h
-# endif
-#endif
-
 #ifdef __UCLIBC_HAS_CTYPE_TABLES__
 # if !defined(__UCLIBC_HAS_XLOCALE__) || defined(L_iswctype_l)
 static const unsigned short int desc2flag[] = {
@@ -570,12 +553,6 @@ int iswctype(wint_t wc, wctype_t desc)
 
 #else  /* __LOCALE_C_ONLY */
 
-#ifdef __UCLIBC_MJN3_ONLY__
-# ifdef L_iswctype
-#  warning CONSIDER: Handle combining class?
-# endif
-#endif
-
 #ifdef L_iswctype
 # define ISWCTYPE(w,d) iswctype(w,d)
 #else
@@ -629,9 +606,6 @@ int ISWCTYPE(wint_t wc, wctype_t desc)
 #endif
 		}
 
-#ifdef __UCLIBC_MJN3_ONLY__
-# warning TODO: xdigit really needs to be handled better.  Remember only for ascii!
-#endif
 		/* TODO - Add locale-specific classifications. */
 		return (desc == _CTYPE_iswxdigit) ? __C_iswxdigit(wc) : 0;
 	}
@@ -741,9 +715,6 @@ wint_t TOWCTRANS(wint_t wc, wctrans_t desc)
 			}
 			wc += WCuplow_diff[i];
 			if (desc == _CTYPE_totitle) {
-#ifdef __UCLIBC_MJN3_ONLY__
-# warning TODO: Verify totitle special cases!
-#endif
 				/* WARNING! These special cases work for glibc 2.2.4.  Changes
 				 * may be needed if the glibc locale tables are updated. */
 				if ((__uwchar_t)(wc - 0x1c4) <= (0x1cc - 0x1c4)
@@ -781,9 +752,6 @@ wint_t TOWCTRANS(wint_t wc, wctrans_t desc)
 	if ((unsigned)(desc - _CTYPE_toupper) <= (_CTYPE_totitle - _CTYPE_toupper)) {
 		wc = TOWUPPER(wc, __UCLIBC_CURLOCALE);
 		if (desc == _CTYPE_totitle) {
-#ifdef __UCLIBC_MJN3_ONLY__
-# warning TODO: Verify totitle special cases!
-#endif
 			/* WARNING! These special cases work for glibc 2.2.4.  Changes
 			 * may be needed if the glibc locale tables are updated. */
 			if ((__uwchar_t)(wc - 0x1c4) <= (0x1cc - 0x1c4)
@@ -843,10 +811,6 @@ libc_hidden_def(wctrans)
 /**********************************************************************/
 #ifdef L_wctrans_l
 
-# ifdef __UCLIBC_MJN3_ONLY__
-#  warning REMINDER: Currently wctrans_l simply calls wctrans.
-# endif
-
 wctrans_t wctrans_l(const char *property, __locale_t locale)
 {
 	return wctrans(property);
diff --git a/libc/stdio/_READ.c b/libc/stdio/_READ.c
index a548dbb3f..a3c141385 100644
--- a/libc/stdio/_READ.c
+++ b/libc/stdio/_READ.c
@@ -38,9 +38,6 @@ size_t attribute_hidden __stdio_READ(register FILE *stream,
 			bufsize = SSIZE_MAX;
 		}
 
-#ifdef __UCLIBC_MJN3_ONLY__
-#warning EINTR?
-#endif
 /* 	RETRY: */
 		if ((rv = __READ(stream, (char *) buf, bufsize)) <= 0) {
 			if (rv == 0) {
@@ -50,9 +47,6 @@ size_t attribute_hidden __stdio_READ(register FILE *stream,
 				__STDIO_STREAM_SET_ERROR(stream);
 				rv = 0;
 			}
-#ifdef __UCLIBC_MJN3_ONLY__
-#warning TODO: Make custom stream read return check optional.
-#endif
 #ifdef __UCLIBC_HAS_GLIBC_CUSTOM_STREAMS__
 		} else {
 			assert(rv <= bufsize);
diff --git a/libc/stdio/_WRITE.c b/libc/stdio/_WRITE.c
index 712236f8f..113f0eb86 100644
--- a/libc/stdio/_WRITE.c
+++ b/libc/stdio/_WRITE.c
@@ -46,9 +46,6 @@ size_t attribute_hidden __stdio_WRITE(register FILE *stream,
 		stodo = (todo <= SSIZE_MAX) ? todo : SSIZE_MAX;
 		rv = __WRITE(stream, (char *) buf, stodo);
 		if (rv >= 0) {
-#ifdef __UCLIBC_MJN3_ONLY__
-#warning TODO: Make custom stream write return check optional.
-#endif
 #ifdef __UCLIBC_HAS_GLIBC_CUSTOM_STREAMS__
 			assert(rv <= stodo);
 			if (rv > stodo) {	/* Wrote more than stodo! */
diff --git a/libc/stdio/_fopen.c b/libc/stdio/_fopen.c
index be05c48a5..ddad1586c 100644
--- a/libc/stdio/_fopen.c
+++ b/libc/stdio/_fopen.c
@@ -64,11 +64,6 @@ FILE attribute_hidden *_stdio_fopen(intptr_t fname_or_mode,
 		open_mode += (O_RDWR - (O_RDONLY | O_WRONLY));
 	}
 
-#ifdef __UCLIBC_MJN3_ONLY__
-#warning CONSIDER: Implement glibc ccs option to bind a codeset?
-#warning CONSIDER: Implement glibc mmap option for readonly files?
-#warning CONSIDER: Implement a text mode using custom read/write funcs?
-#endif
 #if defined(__UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE__) || defined(__UCLIBC_HAS_FOPEN_LARGEFILE_MODE__) || \
     defined(__UCLIBC_HAS_FOPEN_CLOSEEXEC_MODE__)
 
@@ -110,10 +105,6 @@ FILE attribute_hidden *_stdio_fopen(intptr_t fname_or_mode,
 #endif
 	}
 
-#ifdef __UCLIBC_MJN3_ONLY__
-#warning TODO: Verify fdopen append behavior of glibc.
-#endif
-
 	if (filedes >= 0) {			/* Handle fdopen trickery. */
 		stream->__filedes = filedes;
 		/* NOTE: it is insufficient to just check R/W/RW agreement.
diff --git a/libc/stdio/_fpmaxtostr.c b/libc/stdio/_fpmaxtostr.c
index 35805844a..b06b25aa0 100644
--- a/libc/stdio/_fpmaxtostr.c
+++ b/libc/stdio/_fpmaxtostr.c
@@ -210,9 +210,6 @@ ssize_t _fpmaxtostr(FILE * fp, __fpmax_t x, struct printf_info *info,
 	intptr_t pc_fwi[3*MAX_CALLS];
 	intptr_t *ppc;
 	intptr_t *ppc_last;
-#ifdef __UCLIBC_MJN3_ONLY__
-#warning TODO: The size of exp_buf[] should really be determined by the float constants.
-#endif /* __UCLIBC_MJN3_ONLY__ */
 	char exp_buf[16];
 	char buf[BUF_SIZE];
 	char sign_str[6];			/* Last 2 are for 1st digit + nul. */
@@ -291,9 +288,6 @@ ssize_t _fpmaxtostr(FILE * fp, __fpmax_t x, struct printf_info *info,
 
 	{
 		int i, j;
-#ifdef __UCLIBC_MJN3_ONLY__
-#warning TODO: Clean up defines when hexadecimal float notation is unsupported.
-#endif /* __UCLIBC_MJN3_ONLY__ */
 
 #ifdef __UCLIBC_HAS_HEXADECIMAL_FLOATS__
 
@@ -375,9 +369,6 @@ ssize_t _fpmaxtostr(FILE * fp, __fpmax_t x, struct print