diff options
Diffstat (limited to 'chromium/third_party/libjpeg_turbo/jmorecfg.h')
| -rw-r--r-- | chromium/third_party/libjpeg_turbo/jmorecfg.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/chromium/third_party/libjpeg_turbo/jmorecfg.h b/chromium/third_party/libjpeg_turbo/jmorecfg.h index 0b4c8cf35de..e9d8d54a120 100644 --- a/chromium/third_party/libjpeg_turbo/jmorecfg.h +++ b/chromium/third_party/libjpeg_turbo/jmorecfg.h @@ -1,9 +1,10 @@ /* * jmorecfg.h * + * This file was part of the Independent JPEG Group's software: * Copyright (C) 1991-1997, Thomas G. Lane. + * Modifications: * Copyright (C) 2009, 2011, D. R. Commander. - * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * * This file contains additional configuration options that customize the @@ -216,8 +217,11 @@ typedef unsigned int JDIMENSION; #ifndef FAR #ifdef NEED_FAR_POINTERS +#ifndef FAR #define FAR far +#endif #else +#undef FAR #define FAR #endif #endif |