diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-04-12 19:55:49 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-04-12 20:03:48 +0200 |
| commit | e07ca6480d723309bd7a9ea638fd7381d294db21 (patch) | |
| tree | d1fc24e647043665dea8a397648478d7590d25bf | |
| parent | dcc22d9860f013b3986bcca71f7d102c72ab353d (diff) | |
Avoid reserved identifier
Change-Id: I2e632b1e3f6f8725b184918c2205c3772bb37e32
| -rw-r--r-- | external/jpeg/patches/jpeg-8c-jmorecfg.patch | 2 | ||||
| -rw-r--r-- | include/tools/solar.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/external/jpeg/patches/jpeg-8c-jmorecfg.patch b/external/jpeg/patches/jpeg-8c-jmorecfg.patch index eed791fae9a0..89a92c66691d 100644 --- a/external/jpeg/patches/jpeg-8c-jmorecfg.patch +++ b/external/jpeg/patches/jpeg-8c-jmorecfg.patch @@ -4,7 +4,7 @@ /* INT32 must hold at least signed 32-bit values. */ #ifndef XMD_H /* X11/xmd.h correctly defines INT32 */ -+#ifndef _SOLAR_H ++#ifndef INCLUDED_TOOLS_SOLAR_H #ifndef _BASETSD_H_ /* Microsoft defines it in basetsd.h */ #ifndef _BASETSD_H /* MinGW is slightly different */ #ifndef QGLOBAL_H /* Qt defines it in qglobal.h */ diff --git a/include/tools/solar.h b/include/tools/solar.h index e503f38fd908..2c4793b95f38 100644 --- a/include/tools/solar.h +++ b/include/tools/solar.h @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SOLAR_H -#define _SOLAR_H +#ifndef INCLUDED_TOOLS_SOLAR_H +#define INCLUDED_TOOLS_SOLAR_H #include <sal/types.h> #include <osl/endian.h> |