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/llprocessor.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/llprocessor.h')
| -rw-r--r-- | indra/llcommon/llprocessor.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/llcommon/llprocessor.h b/indra/llcommon/llprocessor.h index ad44e2ccb3..8453263f9d 100644 --- a/indra/llcommon/llprocessor.h +++ b/indra/llcommon/llprocessor.h @@ -11,15 +11,14 @@ /////////////////////////////////////////// -#ifndef PROCESSOR_H -#define PROCESSOR_H +#ifndef LLPROCESSOR_H +#define LLPROCESSOR_H // Options: /////////// #if LL_WINDOWS #define PROCESSOR_FREQUENCY_MEASURE_AVAILABLE #endif -// Includes <windows.h> --> code gets os-dependend (Win32) typedef struct ProcessorExtensions |