From 45c87257ed1281ef7b4335b47f49c8054d535507 Mon Sep 17 00:00:00 2001 From: Siana Gearz Date: Tue, 2 Aug 2011 01:13:53 +0200 Subject: [PATCH] Debug build fixes, linux32 --- indra/cmake/00-Common.cmake | 2 +- indra/llcommon/llprocesslauncher.cpp | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake index 96005febe..66abb6edb 100644 --- a/indra/cmake/00-Common.cmake +++ b/indra/cmake/00-Common.cmake @@ -230,7 +230,7 @@ if (LINUX) endif (${ARCH} STREQUAL "x86_64") endif (VIEWER) - set(CMAKE_CXX_FLAGS_DEBUG "-fno-inline ${CMAKE_CXX_FLAGS_DEBUG}") + set(CMAKE_CXX_FLAGS_DEBUG "-fno-inline ${CMAKE_CXX_FLAGS_DEBUG} -msse2") set(CMAKE_CXX_FLAGS_RELEASE "-O3 ${CMAKE_CXX_FLAGS_RELEASE}") set(CMAKE_C_FLAGS_RELEASE "-O3 ${CMAKE_C_FLAGS_RELEASE}") set(CMAKE_CXX_FLAGS_RELEASESSE2 "-O3 ${CMAKE_CXX_FLAGS_RELEASESSE2}") diff --git a/indra/llcommon/llprocesslauncher.cpp b/indra/llcommon/llprocesslauncher.cpp index 45bd98e20..b6d410da9 100644 --- a/indra/llcommon/llprocesslauncher.cpp +++ b/indra/llcommon/llprocesslauncher.cpp @@ -328,7 +328,11 @@ int LLProcessLauncher::launch(void) apr_file_t* out; AIAPRPool pool; pool.create(); +#if(APR_VERSION_MAJOR==1 && APR_VERSION_MINOR>=3 || APR_VERSION_MAJOR>1) apr_status_t status = apr_file_pipe_create_ex(&in, &out, APR_FULL_BLOCK, pool()); +#else + apr_status_t status = apr_file_pipe_create(&in, &out, pool()); +#endif assert(status == APR_SUCCESS); bool success = (status == APR_SUCCESS); if (success)