diff options
| author | Jacek Antonelli | 2008-08-15 23:45:04 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2008-08-15 23:45:04 -0500 |
| commit | 117e22047c5752352342d64e3fb7ce00a4eb8113 (patch) | |
| tree | e32de2cfba0dda8705ae528fcd1fbe23ba075685 /linden/indra/llimage/llimagejpeg.h | |
| parent | Second Life viewer sources 1.18.0.6 (diff) | |
| download | meta-impy-117e22047c5752352342d64e3fb7ce00a4eb8113.zip meta-impy-117e22047c5752352342d64e3fb7ce00a4eb8113.tar.gz meta-impy-117e22047c5752352342d64e3fb7ce00a4eb8113.tar.bz2 meta-impy-117e22047c5752352342d64e3fb7ce00a4eb8113.tar.xz | |
Second Life viewer sources 1.18.1.2
Diffstat (limited to '')
| -rw-r--r-- | linden/indra/llimage/llimagejpeg.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/linden/indra/llimage/llimagejpeg.h b/linden/indra/llimage/llimagejpeg.h index aca780d..34b3f76 100644 --- a/linden/indra/llimage/llimagejpeg.h +++ b/linden/indra/llimage/llimagejpeg.h | |||
| @@ -34,8 +34,13 @@ | |||
| 34 | #include "llimage.h" | 34 | #include "llimage.h" |
| 35 | 35 | ||
| 36 | extern "C" { | 36 | extern "C" { |
| 37 | #include "jpeglib/jpeglib.h" | 37 | #ifdef LL_STANDALONE |
| 38 | #include "jpeglib/jerror.h" | 38 | # include <jpeglib.h> |
| 39 | # include <jerror.h> | ||
| 40 | #else | ||
| 41 | # include "jpeglib/jpeglib.h" | ||
| 42 | # include "jpeglib/jerror.h" | ||
| 43 | #endif | ||
| 39 | } | 44 | } |
| 40 | 45 | ||
| 41 | class LLImageJPEG : public LLImageFormatted | 46 | class LLImageJPEG : public LLImageFormatted |