diff options
| author | simon <none@none> | 2014-07-07 16:17:53 -0700 |
|---|---|---|
| committer | simon <none@none> | 2014-07-07 16:17:53 -0700 |
| commit | bfa42c9e28075cb35f80e6fce7d1db0443027052 (patch) | |
| tree | b4e209e91cd173473f3c2033487647c5eb8c6b5d /indra/llimage | |
| parent | 114f7b5d0f46dfcbc9a94c1907e396b6e02700f6 (diff) | |
| parent | 3e6698073cedc8b24068147cf6b7091f081ea125 (diff) | |
Merge downstream code and become 3.7.12
Diffstat (limited to 'indra/llimage')
| -rwxr-xr-x | indra/llimage/llimagejpeg.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llimage/llimagejpeg.h b/indra/llimage/llimagejpeg.h index 5b596d9fa4..2142660c81 100755 --- a/indra/llimage/llimagejpeg.h +++ b/indra/llimage/llimagejpeg.h @@ -33,7 +33,7 @@ #include "llwin32headerslean.h" extern "C" { -#ifdef LL_STANDALONE +#ifdef LL_USESYSTEMLIBS # include <jpeglib.h> # include <jerror.h> #else |