Sync headers w/ glibc

include/glob.h

@@ -163,11 +163,12 @@ extern int glob (__const char *__restrict __pattern, int __flags,
 /* Free storage allocated in PGLOB by a previous `glob' call.  */
 extern void globfree (glob_t *__pglob) __THROW;
 #else
-extern int glob __P ((__const char *__restrict __pattern, int __flags,
+extern int __REDIRECT_NTH (glob, (__const char *__restrict __pattern,
-		      int (*__errfunc) (__const char *, int),
+				  int __flags,
-		      glob_t *__restrict __pglob)) __asm__ ("glob64");
+				  int (*__errfunc) (__const char *, int),
+				  glob_t *__restrict __pglob), glob64);
 
-extern void globfree __P ((glob_t *__pglob)) __asm__ ("globfree64");
+extern void __REDIRECT_NTH (globfree, (glob_t *__pglob), globfree64);
 #endif
 
 #ifdef __USE_LARGEFILE64

include/locale.h

@@ -218,12 +218,6 @@ extern __locale_t uselocale (__locale_t __dataset) __THROW;
    Passing this value to any other function has undefined behavior.  */
 # define LC_GLOBAL_LOCALE	((__locale_t) -1L)
 
-extern __locale_t __newlocale (int __category_mask, __const char *__locale,
-			     __locale_t __base) __THROW;
-extern __locale_t __duplocale (__locale_t __dataset) __THROW;
-extern void __freelocale (__locale_t __dataset) __THROW;
-extern __locale_t __uselocale (__locale_t __dataset) __THROW;
-
 #endif
 
 __END_DECLS