From 9db949eec327df4173fde3de934a87bedb0db13c Mon Sep 17 00:00:00 2001
From: Bryan O'Sullivan <bos@lindenlab.com>
Date: Mon, 2 Jun 2008 21:14:31 +0000
Subject: svn merge -r88066:88786
 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge

dataserver-is-deprecated
for-fucks-sake-whats-with-these-commit-markers
---
 indra/llmessage/lliosocket.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/llmessage/lliosocket.cpp')

diff --git a/indra/llmessage/lliosocket.cpp b/indra/llmessage/lliosocket.cpp
index b1f55a297c..ff7c32aee8 100644
--- a/indra/llmessage/lliosocket.cpp
+++ b/indra/llmessage/lliosocket.cpp
@@ -68,7 +68,7 @@ bool is_addr_in_use(apr_status_t status)
 // Define this to see the actual file descriptors being tossed around.
 //#define LL_DEBUG_SOCKET_FILE_DESCRIPTORS 1
 #if LL_DEBUG_SOCKET_FILE_DESCRIPTORS
-#include "apr-1/apr_portable.h"
+#include "apr_portable.h"
 #endif
 #endif
 
-- 
cgit v1.2.3