From d60f16540dba5616cd8260046b44ebc2a1047065 Mon Sep 17 00:00:00 2001 From: Josh Bell Date: Thu, 4 Jan 2007 02:04:29 +0000 Subject: svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@56429 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance@56431 This turned up the following "lost" changes: llapp.cpp (from maintenance r55371) - SIGPIPE fix, possibly llfontgl.cpp (from maintenance r50207) - whitespace only inventorybridge.cpp (property - non-executable) skins/xui/*/* (from maintenance r55380) - XML processing instruction went AWOL --- indra/llcommon/linden_common.h | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'indra/llcommon/linden_common.h') diff --git a/indra/llcommon/linden_common.h b/indra/llcommon/linden_common.h index 199d380809..3e9ec14eb3 100644 --- a/indra/llcommon/linden_common.h +++ b/indra/llcommon/linden_common.h @@ -27,17 +27,6 @@ #include #include "llfile.h" -#if LL_WINDOWS -// Limit Windows API to small and manageable set. -// If you get undefined symbols, find the appropriate -// Windows header file and include that in your .cpp file. -// Please don't take this out -- it helps with library -// compile times. JC -#define WIN32_LEAN_AND_MEAN -#include -#include -#endif // LL_WINDOWS - #include "stdtypes.h" #include "lldefs.h" #include "llerror.h" @@ -50,4 +39,4 @@ #pragma warning (3 : 4702) // we like level 3, not 4 #endif // LL_WINDOWS -#endif // not LL_LINDEN_COMMON_H +#endif -- cgit v1.2.3