diff --git a/mozilla/include/allxpstr.h b/mozilla/include/allxpstr.h index 528b6b0aa59..7b5c455c38c 100644 --- a/mozilla/include/allxpstr.h +++ b/mozilla/include/allxpstr.h @@ -57,14 +57,14 @@ #define _ALLXPSTR_H_ #include "resdef.h" - +/* #ifdef XP_MAC #define XP_MSG_BASE 1000 #define SEC_DIALOG_STRING_BASE 3000 -#else +#else */ #define XP_MSG_BASE 14000 #define SEC_DIALOG_STRING_BASE (XP_MSG_BASE + 2000) -#endif +/*#endif*/ /* WARNING: DO NOT TAKE ERROR CODE -666, it is used internally by the message lib */ diff --git a/mozilla/include/allxpstr.rc b/mozilla/include/allxpstr.rc index 528b6b0aa59..7b5c455c38c 100644 --- a/mozilla/include/allxpstr.rc +++ b/mozilla/include/allxpstr.rc @@ -57,14 +57,14 @@ #define _ALLXPSTR_H_ #include "resdef.h" - +/* #ifdef XP_MAC #define XP_MSG_BASE 1000 #define SEC_DIALOG_STRING_BASE 3000 -#else +#else */ #define XP_MSG_BASE 14000 #define SEC_DIALOG_STRING_BASE (XP_MSG_BASE + 2000) -#endif +/*#endif*/ /* WARNING: DO NOT TAKE ERROR CODE -666, it is used internally by the message lib */ diff --git a/mozilla/modules/rdf/src/ht.c b/mozilla/modules/rdf/src/ht.c index 935f0661ee1..67052455d78 100644 --- a/mozilla/modules/rdf/src/ht.c +++ b/mozilla/modules/rdf/src/ht.c @@ -32,7 +32,11 @@ #include "rdfparse.h" #include "remstore.h" #include "ht.h" - +/* BEGIN NEW_STRING_LIB*/ +#ifdef XP_MAC +#include "allxpstr.h" +#endif +/* END NEW_STRING_LIB*/ /* globals */ HT_Icon urlList = NULL;