From a82953d0d06fcd9a06decb70b4c6504093df6c03 Mon Sep 17 00:00:00 2001
From: Lirusaito <inusaito@gmail.com>
Date: Sun, 29 Apr 2012 00:25:40 -0400
Subject: [PATCH] Few more GCC 4.7 fixes.

include unistd when not on windows.
---
 indra/llcommon/llfile.cpp                     | 2 ++
 indra/llcommon/llprocesslauncher.cpp          | 1 +
 indra/llmessage/lliopipe.h                    | 6 +++---
 indra/llmessage/tests/llcurl_stub.cpp         | 6 +++---
 indra/llvfs/llpidlock.cpp                     | 1 +
 indra/plugins/webkit/linux_volume_catcher.cpp | 3 +++
 6 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/indra/llcommon/llfile.cpp b/indra/llcommon/llfile.cpp
index d3e97f5c1..0d8dce1eb 100644
--- a/indra/llcommon/llfile.cpp
+++ b/indra/llcommon/llfile.cpp
@@ -35,6 +35,8 @@
 
 #if LL_WINDOWS
 #include <windows.h>
+#else
+#include <unistd.h>
 #endif
 
 #include "linden_common.h"
diff --git a/indra/llcommon/llprocesslauncher.cpp b/indra/llcommon/llprocesslauncher.cpp
index 8ffd4b06d..8e146e035 100644
--- a/indra/llcommon/llprocesslauncher.cpp
+++ b/indra/llcommon/llprocesslauncher.cpp
@@ -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()
diff --git a/indra/llmessage/lliopipe.h b/indra/llmessage/lliopipe.h
index 884089e97..2def3229f 100644
--- a/indra/llmessage/lliopipe.h
+++ b/indra/llmessage/lliopipe.h
@@ -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
diff --git a/indra/llmessage/tests/llcurl_stub.cpp b/indra/llmessage/tests/llcurl_stub.cpp
index d84fe0a49..de9725e8a 100644
--- a/indra/llmessage/tests/llcurl_stub.cpp
+++ b/indra/llmessage/tests/llcurl_stub.cpp
@@ -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;
 		}
 	}
-};
+//};
 
diff --git a/indra/llvfs/llpidlock.cpp b/indra/llvfs/llpidlock.cpp
index 21cfa66a8..85d41b5d3 100644
--- a/indra/llvfs/llpidlock.cpp
+++ b/indra/llvfs/llpidlock.cpp
@@ -54,6 +54,7 @@ static bool isProcessAlive(U32 pid)
 }
 
 #else   //Everyone Else
+#include <unistd.h>
 
 static U32 getPID() {
 	return getpid();
diff --git a/indra/plugins/webkit/linux_volume_catcher.cpp b/indra/plugins/webkit/linux_volume_catcher.cpp
index de5ce8dd5..0cb73ca1e 100644
--- a/indra/plugins/webkit/linux_volume_catcher.cpp
+++ b/indra/plugins/webkit/linux_volume_catcher.cpp
@@ -40,6 +40,9 @@
 
 #include "volume_catcher.h"
 
+#ifndef LL_WINDOWS
+#include <unistd.h>
+#endif
 
 extern "C" {
 #include <glib.h>