diff --git a/db/mork/src/morkConfig.h b/db/mork/src/morkConfig.h index 30b862e864a2..471190e585bc 100644 --- a/db/mork/src/morkConfig.h +++ b/db/mork/src/morkConfig.h @@ -51,13 +51,17 @@ #define MORK_UNIX 1 #endif +#ifdef XP_BEOS +#define MORK_BEOS 1 +#endif + #ifdef MORK_OBSOLETE #undef MORK_MAC #endif // } %%%%% end platform defs peculiar to Mork %%%%% -#if defined(MORK_WIN) || defined(MORK_UNIX) || defined(MORK_MAC) +#if defined(MORK_WIN) || defined(MORK_UNIX) || defined(MORK_MAC) || defined(MORK_BEOS) #include "stdio.h" #include "ctype.h" #include "errno.h" @@ -105,10 +109,10 @@ # define mork_kNewline "\015\012" # define mork_kNewlineSize 2 # else -# ifdef MORK_UNIX +# if defined(MORK_UNIX) || defined(MORK_BEOS) # define mork_kNewline "\012" # define mork_kNewlineSize 1 -# endif /* MORK_UNIX */ +# endif /* MORK_UNIX || MORK_BEOS */ # endif /* MORK_WIN */ #endif /* MORK_MAC */ @@ -128,7 +132,7 @@ extern void mork_assertion_signal(const char* inMessage); #define MORK_PROVIDE_STDLIB 1 #endif /*MORK_OBSOLETE*/ -#if defined(MORK_WIN) || defined(MORK_UNIX) || defined(MORK_MAC) +#if defined(MORK_WIN) || defined(MORK_UNIX) || defined(MORK_MAC) || defined(MORK_BEOS) #define MORK_USE_C_STDLIB 1 #endif /*MORK_WIN*/ diff --git a/db/mork/src/morkFile.cpp b/db/mork/src/morkFile.cpp index b3aee53de931..61aef7e08314 100644 --- a/db/mork/src/morkFile.cpp +++ b/db/mork/src/morkFile.cpp @@ -231,11 +231,11 @@ morkFile::NewFileErrnoError(morkEnv* ev) const "\015\012\015\012\015\012\015\012\015\012\015\012\015\012\015\012"; # define morkFile_kNewlinesCount 8 # else -# ifdef MORK_UNIX +# if defined(MORK_UNIX) || defined(MORK_BEOS) static const char* morkFile_kNewlines = "\012\012\012\012\012\012\012\012\012\012\012\012\012\012\012\012"; # define morkFile_kNewlinesCount 16 -# endif /* MORK_UNIX */ +# endif /* MORK_UNIX || MORK_BEOS */ # endif /* MORK_WIN */ #endif /* MORK_MAC */ diff --git a/mailnews/addrbook/src/nsDirPrefs.cpp b/mailnews/addrbook/src/nsDirPrefs.cpp index a1a6fe5700e3..a7486ecb42da 100644 --- a/mailnews/addrbook/src/nsDirPrefs.cpp +++ b/mailnews/addrbook/src/nsDirPrefs.cpp @@ -2537,7 +2537,7 @@ void DIR_SetFileName(char** fileName, const char* leafName) char* tempName = WH_TempName(type, leafName); char* nativeName = WH_FileName(tempName, type); char* urlName = XP_PlatformFileToURL(nativeName); -#if defined(XP_WIN) || defined(XP_UNIX) || defined(XP_MAC) || defined(XP_OS2) +#if defined(XP_WIN) || defined(XP_UNIX) || defined(XP_MAC) || defined(XP_OS2) || defined(XP_BEOS) char* newLeafName = XP_STRRCHR (urlName + PL_strlen("file://"), '/'); (*fileName) = newLeafName ? PL_strdup(newLeafName + 1) : PL_strdup(urlName + PL_strlen("file://")); #else diff --git a/mailnews/base/util/nsMsgUtils.cpp b/mailnews/base/util/nsMsgUtils.cpp index 0573e6fe0a5d..fc388fb58509 100644 --- a/mailnews/base/util/nsMsgUtils.cpp +++ b/mailnews/base/util/nsMsgUtils.cpp @@ -238,7 +238,7 @@ nsresult NS_MsgHashIfNecessary(nsString &name) const PRUint32 MAX_LEN = 8; #elif defined(XP_MAC) const PRUint32 MAX_LEN = 25; -#elif defined(XP_UNIX) || defined(XP_PC) +#elif defined(XP_UNIX) || defined(XP_PC) || defined(XP_BEOS) const PRUint32 MAX_LEN = 55; #else #error need_to_define_your_max_filename_length diff --git a/mailnews/compose/src/nsMsgCompUtils.cpp b/mailnews/compose/src/nsMsgCompUtils.cpp index 28db0a98fe55..6b1cf2ef8d41 100644 --- a/mailnews/compose/src/nsMsgCompUtils.cpp +++ b/mailnews/compose/src/nsMsgCompUtils.cpp @@ -64,7 +64,7 @@ GetTheTempDirectoryOnTheSystem(void) // RICHIE - should do something better here! -#ifdef XP_UNIX +#if defined(XP_UNIX) || defined(XP_BEOS) PL_strncpy(retPath, "/tmp/", TPATH_LEN); #endif diff --git a/mailnews/compose/tests/compose2/test2.cpp b/mailnews/compose/tests/compose2/test2.cpp index f7a50d55560f..cf8c956e0e65 100644 --- a/mailnews/compose/tests/compose2/test2.cpp +++ b/mailnews/compose/tests/compose2/test2.cpp @@ -88,7 +88,7 @@ GetTheTempDirectoryOnTheSystem(void) // RICHIE - should do something better here! -#ifdef XP_UNIX +#if defined(XP_UNIX) || defined(XP_BEOS) PL_strncpy(retPath, "/tmp/", 1024); #endif diff --git a/mailnews/db/mork/src/morkConfig.h b/mailnews/db/mork/src/morkConfig.h index 30b862e864a2..471190e585bc 100644 --- a/mailnews/db/mork/src/morkConfig.h +++ b/mailnews/db/mork/src/morkConfig.h @@ -51,13 +51,17 @@ #define MORK_UNIX 1 #endif +#ifdef XP_BEOS +#define MORK_BEOS 1 +#endif + #ifdef MORK_OBSOLETE #undef MORK_MAC #endif // } %%%%% end platform defs peculiar to Mork %%%%% -#if defined(MORK_WIN) || defined(MORK_UNIX) || defined(MORK_MAC) +#if defined(MORK_WIN) || defined(MORK_UNIX) || defined(MORK_MAC) || defined(MORK_BEOS) #include "stdio.h" #include "ctype.h" #include "errno.h" @@ -105,10 +109,10 @@ # define mork_kNewline "\015\012" # define mork_kNewlineSize 2 # else -# ifdef MORK_UNIX +# if defined(MORK_UNIX) || defined(MORK_BEOS) # define mork_kNewline "\012" # define mork_kNewlineSize 1 -# endif /* MORK_UNIX */ +# endif /* MORK_UNIX || MORK_BEOS */ # endif /* MORK_WIN */ #endif /* MORK_MAC */ @@ -128,7 +132,7 @@ extern void mork_assertion_signal(const char* inMessage); #define MORK_PROVIDE_STDLIB 1 #endif /*MORK_OBSOLETE*/ -#if defined(MORK_WIN) || defined(MORK_UNIX) || defined(MORK_MAC) +#if defined(MORK_WIN) || defined(MORK_UNIX) || defined(MORK_MAC) || defined(MORK_BEOS) #define MORK_USE_C_STDLIB 1 #endif /*MORK_WIN*/ diff --git a/mailnews/db/mork/src/morkFile.cpp b/mailnews/db/mork/src/morkFile.cpp index b3aee53de931..61aef7e08314 100644 --- a/mailnews/db/mork/src/morkFile.cpp +++ b/mailnews/db/mork/src/morkFile.cpp @@ -231,11 +231,11 @@ morkFile::NewFileErrnoError(morkEnv* ev) const "\015\012\015\012\015\012\015\012\015\012\015\012\015\012\015\012"; # define morkFile_kNewlinesCount 8 # else -# ifdef MORK_UNIX +# if defined(MORK_UNIX) || defined(MORK_BEOS) static const char* morkFile_kNewlines = "\012\012\012\012\012\012\012\012\012\012\012\012\012\012\012\012"; # define morkFile_kNewlinesCount 16 -# endif /* MORK_UNIX */ +# endif /* MORK_UNIX || MORK_BEOS */ # endif /* MORK_WIN */ #endif /* MORK_MAC */