diff options
| author | Josh Bell <josh@lindenlab.com> | 2007-01-04 02:04:29 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2007-01-04 02:04:29 +0000 |
| commit | d60f16540dba5616cd8260046b44ebc2a1047065 (patch) | |
| tree | ab241efaf58ba4eeb1916763cef337a04bc15d64 /indra/llcommon/linden_common.h | |
| parent | 0434d35c160bcd0d78b8f4e795a62155f50a6fb8 (diff) | |
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
Diffstat (limited to 'indra/llcommon/linden_common.h')
| -rw-r--r-- | indra/llcommon/linden_common.h | 13 |
1 files changed, 1 insertions, 12 deletions
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 <string> #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 <winsock2.h> -#include <windows.h> -#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 |