Few more GCC 4.7 fixes.

include unistd when not on windows.
This commit is contained in:
Lirusaito
2012-04-29 00:25:40 -04:00
parent 16c2235510
commit a82953d0d0
6 changed files with 13 additions and 6 deletions

View File

@@ -35,6 +35,8 @@
#if LL_WINDOWS
#include <windows.h>
#else
#include <unistd.h>
#endif
#include "linden_common.h"

View File

@@ -42,6 +42,7 @@
#if LL_DARWIN || LL_LINUX
// not required or present on Win32
#include <sys/wait.h>
#include <unistd.h>
#endif
LLProcessLauncher::LLProcessLauncher()

View File

@@ -55,11 +55,11 @@ void pump_debug(const char *file, S32 line);
/**
* intrusive pointer support
*/
namespace boost
{
//namespace boost
//{
void intrusive_ptr_add_ref(LLIOPipe* p);
void intrusive_ptr_release(LLIOPipe* p);
};
//};
/**
* @class LLIOPipe

View File

@@ -77,8 +77,8 @@ void LLCurl::Responder::result(LLSD const&)
{
}
namespace boost
{
//namespace boost
//{
void intrusive_ptr_add_ref(LLCurl::Responder* p)
{
++p->mReferenceCount;
@@ -91,5 +91,5 @@ namespace boost
delete p;
}
}
};
//};

View File

@@ -54,6 +54,7 @@ static bool isProcessAlive(U32 pid)
}
#else //Everyone Else
#include <unistd.h>
static U32 getPID() {
return getpid();

View File

@@ -40,6 +40,9 @@
#include "volume_catcher.h"
#ifndef LL_WINDOWS
#include <unistd.h>
#endif
extern "C" {
#include <glib.h>