--- gcc/c-pragma.c	22 Sep 2003 16:54:28 -0000	1.53.2.8
+++ gcc/c-pragma.c	31 Oct 2003 18:46:50 -0000
@@ -352,7 +352,6 @@ maybe_apply_pragma_weak (tree decl ATTRI
 
 static GTY(()) tree pending_redefine_extname;
 
-#ifdef HANDLE_PRAGMA_REDEFINE_EXTNAME
 static void handle_pragma_redefine_extname PARAMS ((cpp_reader *));
 
 /* #pragma redefined_extname oldname newname */
@@ -387,7 +386,6 @@ handle_pragma_redefine_extname (cpp_read
   else
     add_to_renaming_pragma_list(oldname, newname);
 }
-#endif
 
 void
 add_to_renaming_pragma_list (tree oldname, tree newname)
@@ -501,6 +499,9 @@ init_pragma (void)
 #endif
 #ifdef HANDLE_PRAGMA_REDEFINE_EXTNAME
   c_register_pragma (0, "redefine_extname", handle_pragma_redefine_extname);
+#else
+  if (flag_mudflap)
+    c_register_pragma (0, "redefine_extname", handle_pragma_redefine_extname);
 #endif
 #ifdef HANDLE_PRAGMA_EXTERN_PREFIX
   c_register_pragma (0, "extern_prefix", handle_pragma_extern_prefix);

--- libmudflap/mf-runtime.h.in.orig	2003-05-13 04:51:34.000000000 -0400
+++ libmudflap/mf-runtime.h.in	2003-11-03 12:53:50.000000000 -0500
@@ -65,37 +65,37 @@
    instrumented modules are meant to be affected.  */
 
 #ifdef _MUDFLAP  
-#define memcpy __mfwrap_memcpy 
-#define memmove __mfwrap_memmove
-#define memset __mfwrap_memset 
-#define memcmp __mfwrap_memcmp 
-#define memchr __mfwrap_memchr 
-#define memrchr __mfwrap_memrchr
-#define strcpy __mfwrap_strcpy 
-#define strncpy __mfwrap_strncpy 
-#define strcat __mfwrap_strcat 
-#define strncat __mfwrap_strncat
-#define strcmp __mfwrap_strcmp 
-#define strcasecmp __mfwrap_strcasecmp 
-#define strncmp __mfwrap_strncmp 
-#define strncasecmp __mfwrap_strncasecmp
-#define strdup __mfwrap_strdup 
-#define strndup __mfwrap_strndup 
-#define strchr __mfwrap_strchr 
-#define strrchr __mfwrap_strrchr
-#define strstr __mfwrap_strstr 
-#define memmem __mfwrap_memmem 
-#define strlen __mfwrap_strlen 
-#define strnlen __mfwrap_strnlen
-#define bzero __mfwrap_bzero 
-#define bcopy __mfwrap_bcopy 
-#define bcmp __mfwrap_bcmp 
-#define index __mfwrap_index 
-#define rindex __mfwrap_rindex
-#define asctime __mfwrap_asctime
-#define ctime __mfwrap_ctime
-#define gmtime __mfwrap_gmtime
-#define localtime __mfwrap_localtime
+#pragma redefine_extname memcpy __mfwrap_memcpy 
+#pragma redefine_extname memmove __mfwrap_memmove
+#pragma redefine_extname memset __mfwrap_memset 
+#pragma redefine_extname memcmp __mfwrap_memcmp 
+#pragma redefine_extname memchr __mfwrap_memchr 
+#pragma redefine_extname memrchr __mfwrap_memrchr
+#pragma redefine_extname strcpy __mfwrap_strcpy 
+#pragma redefine_extname strncpy __mfwrap_strncpy 
+#pragma redefine_extname strcat __mfwrap_strcat 
+#pragma redefine_extname strncat __mfwrap_strncat
+#pragma redefine_extname strcmp __mfwrap_strcmp 
+#pragma redefine_extname strcasecmp __mfwrap_strcasecmp 
+#pragma redefine_extname strncmp __mfwrap_strncmp 
+#pragma redefine_extname strncasecmp __mfwrap_strncasecmp
+#pragma redefine_extname strdup __mfwrap_strdup 
+#pragma redefine_extname strndup __mfwrap_strndup 
+#pragma redefine_extname strchr __mfwrap_strchr 
+#pragma redefine_extname strrchr __mfwrap_strrchr
+#pragma redefine_extname strstr __mfwrap_strstr 
+#pragma redefine_extname memmem __mfwrap_memmem 
+#pragma redefine_extname strlen __mfwrap_strlen 
+#pragma redefine_extname strnlen __mfwrap_strnlen
+#pragma redefine_extname bzero __mfwrap_bzero 
+#pragma redefine_extname bcopy __mfwrap_bcopy 
+#pragma redefine_extname bcmp __mfwrap_bcmp 
+#pragma redefine_extname index __mfwrap_index 
+#pragma redefine_extname rindex __mfwrap_rindex
+#pragma redefine_extname asctime __mfwrap_asctime
+#pragma redefine_extname ctime __mfwrap_ctime
+#pragma redefine_extname gmtime __mfwrap_gmtime
+#pragma redefine_extname localtime __mfwrap_localtime
 
 /* Disable glibc macros.  */
 #define __NO_STRING_INLINES
