зеркало из https://github.com/mozilla/gecko-dev.git
Applying BeOS fixes for PSM to tip. Bug #39164
This commit is contained in:
Родитель
f7113ab1b2
Коммит
7c56b4260d
|
@ -37,7 +37,9 @@
|
|||
#include <sys/socket.h>
|
||||
#include <netinet/in.h>
|
||||
#include <sys/stat.h>
|
||||
#ifndef XP_BEOS
|
||||
#include <netinet/tcp.h>
|
||||
#endif
|
||||
#else
|
||||
#ifdef XP_MAC
|
||||
#include <Events.h> // 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);
|
||||
|
|
|
@ -49,6 +49,9 @@
|
|||
#ifdef XP_OS2_VACPP
|
||||
#include <utils.h>
|
||||
#endif
|
||||
#ifdef XP_BEOS
|
||||
#include "ByteOrder.h"
|
||||
#endif
|
||||
|
||||
#include "newproto.h"
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче