aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authormark@chromium.org <mark@chromium.org@4c0a9323-5329-0410-9bdc-e9ce6186880e>2013-12-05 23:16:03 +0000
committermark@chromium.org <mark@chromium.org@4c0a9323-5329-0410-9bdc-e9ce6186880e>2013-12-05 23:16:03 +0000
commit616400ed2f2afd89f2cdeabb9f373bff794f2912 (patch)
tree4ee6f198eb790d52b8460d303375b98ad97fa9d8 /src
parentAvoid redefinition of global static debug flag and remove unneeded (diff)
downloadbreakpad-616400ed2f2afd89f2cdeabb9f373bff794f2912.tar.xz
Add include guards and avoid redefinition of false/true in convert_UTF.
Patch by Alistair Tse <altse@chromium.org> Review URL: https://breakpad.appspot.com/834002 git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1245 4c0a9323-5329-0410-9bdc-e9ce6186880e
Diffstat (limited to 'src')
-rw-r--r--src/common/convert_UTF.c5
-rw-r--r--src/common/convert_UTF.h5
2 files changed, 10 insertions, 0 deletions
diff --git a/src/common/convert_UTF.c b/src/common/convert_UTF.c
index 80178d35..636f3288 100644
--- a/src/common/convert_UTF.c
+++ b/src/common/convert_UTF.c
@@ -53,8 +53,13 @@ static const UTF32 halfMask = 0x3FFUL;
#define UNI_SUR_HIGH_END (UTF32)0xDBFF
#define UNI_SUR_LOW_START (UTF32)0xDC00
#define UNI_SUR_LOW_END (UTF32)0xDFFF
+
+#ifndef false
#define false 0
+#endif
+#ifndef true
#define true 1
+#endif
/* --------------------------------------------------------------------- */
diff --git a/src/common/convert_UTF.h b/src/common/convert_UTF.h
index b1556de8..c481c9cb 100644
--- a/src/common/convert_UTF.h
+++ b/src/common/convert_UTF.h
@@ -20,6 +20,9 @@
* remains attached.
*/
+#ifndef COMMON_CONVERT_UTF_H_
+#define COMMON_CONVERT_UTF_H_
+
/* ---------------------------------------------------------------------
Conversions between UTF32, UTF-16, and UTF-8. Header file.
@@ -141,3 +144,5 @@ Boolean isLegalUTF8Sequence(const UTF8 *source, const UTF8 *sourceEnd);
#endif
/* --------------------------------------------------------------------- */
+
+#endif // COMMON_CONVERT_UTF_H_