From f97c8803c16d76001a42d57a19ba6821600a0e9a Mon Sep 17 00:00:00 2001 From: "cls%seawood.org" Date: Tue, 13 Jun 2000 23:13:48 +0000 Subject: [PATCH] Applying BeOS fixes for PSM to tip. Bug #39164 git-svn-id: svn://10.0.0.236/trunk@72137 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/security/psm/lib/client/cmtinit.c | 10 ++++++---- mozilla/security/psm/lib/protocol/newproto.c | 3 +++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/mozilla/security/psm/lib/client/cmtinit.c b/mozilla/security/psm/lib/client/cmtinit.c index 90cc249082d..5555e7b142a 100644 --- a/mozilla/security/psm/lib/client/cmtinit.c +++ b/mozilla/security/psm/lib/client/cmtinit.c @@ -37,7 +37,9 @@ #include #include #include +#ifndef XP_BEOS #include +#endif #else #ifdef XP_MAC #include // for WaitNextEvent @@ -84,7 +86,7 @@ getCurrWorkDir(char *buf, int maxLen) { #if defined WIN32 return _getcwd(buf, maxLen); -#elif defined XP_UNIX +#elif defined(XP_UNIX) || defined(XP_BEOS) return getcwd(buf, maxLen); #else return NULL; @@ -96,7 +98,7 @@ setWorkingDir(char *path) { #if defined WIN32 _chdir(path); -#elif defined XP_UNIX +#elif defined(XP_UNIX) || defined(XP_BEOS) chdir(path); #else return; @@ -141,7 +143,7 @@ launch_psm(char *executable) return CMTSuccess; loser: return CMTFailure; -#elif defined XP_UNIX +#elif defined(XP_UNIX) || defined(XP_BEOS) sprintf(command,"./%s &", executable); if (system(command) == -1) { goto loser; @@ -228,7 +230,7 @@ PCMT_CONTROL CMT_EstablishControlConnection(char *inPath, break; } } -#elif defined XP_UNIX +#elif defined(XP_UNIX) || defined(XP_BEOS) i = 0; while (i<1000) { i += sleep(10); diff --git a/mozilla/security/psm/lib/protocol/newproto.c b/mozilla/security/psm/lib/protocol/newproto.c index a6bb592e9bd..2a160c64e9b 100644 --- a/mozilla/security/psm/lib/protocol/newproto.c +++ b/mozilla/security/psm/lib/protocol/newproto.c @@ -49,6 +49,9 @@ #ifdef XP_OS2_VACPP #include #endif +#ifdef XP_BEOS +#include "ByteOrder.h" +#endif #include "newproto.h"