NORMANDY_DDAY merge...

git-svn-id: svn://10.0.0.236/trunk@4478 18797224-902f-48f8-a5cc-f745e15eee43
1998-06-25 05:50:45 +00:00
parent 9039d5a21d
commit d56dcfe52f
286 changed files with 97121 additions and 1604 deletions
--- a/mozilla/lib/libmsg/msgprefs.cpp
+++ b/mozilla/lib/libmsg/msgprefs.cpp
@@ -30,7 +30,12 @@
 #include "pmsgfilt.h"
 #include "msgimap.h"
 #include "imaphost.h"
-#include "mkreg.h"
+
+extern "C" 
+{
+  #include "mkreg.h"
+}
+
 #include "ptrarray.h"

 #ifdef XP_MAC