summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorimp <imp@FreeBSD.org>2013-09-03 22:04:55 +0000
committerimp <imp@FreeBSD.org>2013-09-03 22:04:55 +0000
commit09ea56b1ca848cde0d84751e27d792fd33e7ab5b (patch)
tree23e977961edbbb375ac94c37c6ec07c190c0b258
parent8f38cafe697c2231df73bf68b210df1f6a325b58 (diff)
downloadFreeBSD-src-09ea56b1ca848cde0d84751e27d792fd33e7ab5b.zip
FreeBSD-src-09ea56b1ca848cde0d84751e27d792fd33e7ab5b.tar.gz
Newer versions of gcc define __INT64_C and __UINT64_C, so avoid
redefining them if gcc provides them.
-rw-r--r--sys/mips/include/_stdint.h2
-rw-r--r--sys/powerpc/include/_stdint.h2
2 files changed, 4 insertions, 0 deletions
diff --git a/sys/mips/include/_stdint.h b/sys/mips/include/_stdint.h
index 510b8ea..ebf6eb5 100644
--- a/sys/mips/include/_stdint.h
+++ b/sys/mips/include/_stdint.h
@@ -66,6 +66,7 @@
#if !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS)
+#ifndef __INT64_C
#ifdef __mips_n64
#define __INT64_C(c) (c ## L)
#define __UINT64_C(c) (c ## UL)
@@ -73,6 +74,7 @@
#define __INT64_C(c) (c ## LL)
#define __UINT64_C(c) (c ## ULL)
#endif
+#endif
/*
* ISO/IEC 9899:1999
diff --git a/sys/powerpc/include/_stdint.h b/sys/powerpc/include/_stdint.h
index 6ad1fd2..9928a1a 100644
--- a/sys/powerpc/include/_stdint.h
+++ b/sys/powerpc/include/_stdint.h
@@ -65,6 +65,7 @@
#if !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS)
+#ifndef __INT64_C
#ifdef __LP64__
#define __INT64_C(c) (c ## L)
#define __UINT64_C(c) (c ## UL)
@@ -72,6 +73,7 @@
#define __INT64_C(c) (c ## LL)
#define __UINT64_C(c) (c ## ULL)
#endif
+#endif
/*
* ISO/IEC 9899:1999
OpenPOWER on IntegriCloud