diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2021-06-19 12:01:18 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2021-06-19 12:01:18 +0000 |
| commit | c0de12404986565d2a7b66569af5e09ec604ffd9 (patch) | |
| tree | 007c6a23022007f52326b10a4843846b59800a00 /src/google_breakpad/common/breakpad_types.h | |
| parent | 05728773737deb58a10cdbe29750152c13e400bf (diff) | |
| parent | 5c069a8915093a3af6bb26639a4ac8aa0db2badb (diff) | |
| download | google-breakpad-android12-mainline-media-release.tar.gz | |
Snap for 7474514 from 5c069a8915093a3af6bb26639a4ac8aa0db2badb to mainline-media-releaseandroid-mainline-12.0.0_r89android-mainline-12.0.0_r74android-mainline-12.0.0_r62android-mainline-12.0.0_r46android-mainline-12.0.0_r29android-mainline-12.0.0_r12android-mainline-12.0.0_r119android-mainline-12.0.0_r104android12-mainline-media-release
Change-Id: Ib9813bef7c81bcd39b9788281fa7219d68f5891a
Diffstat (limited to 'src/google_breakpad/common/breakpad_types.h')
| -rw-r--r-- | src/google_breakpad/common/breakpad_types.h | 28 |
1 files changed, 5 insertions, 23 deletions
diff --git a/src/google_breakpad/common/breakpad_types.h b/src/google_breakpad/common/breakpad_types.h index e92436ff..d8828043 100644 --- a/src/google_breakpad/common/breakpad_types.h +++ b/src/google_breakpad/common/breakpad_types.h @@ -40,35 +40,17 @@ #ifndef GOOGLE_BREAKPAD_COMMON_BREAKPAD_TYPES_H__ #define GOOGLE_BREAKPAD_COMMON_BREAKPAD_TYPES_H__ -#ifndef _WIN32 +#if (defined(_INTTYPES_H) || defined(_INTTYPES_H_)) && \ + !defined(__STDC_FORMAT_MACROS) +#error "inttypes.h has already been included before this header file, but " +#error "without __STDC_FORMAT_MACROS defined." +#endif #ifndef __STDC_FORMAT_MACROS #define __STDC_FORMAT_MACROS #endif /* __STDC_FORMAT_MACROS */ #include <inttypes.h> -#else /* !_WIN32 */ - -#if _MSC_VER >= 1600 -#include <stdint.h> -#elif defined(BREAKPAD_CUSTOM_STDINT_H) -/* Visual C++ Pre-2010 did not ship a stdint.h, so allow - * consumers of this library to provide their own because - * there are often subtle type incompatibilities. - */ -#include BREAKPAD_CUSTOM_STDINT_H -#else -#include <wtypes.h> - -typedef unsigned __int8 uint8_t; -typedef unsigned __int16 uint16_t; -typedef __int32 int32_t; -typedef unsigned __int32 uint32_t; -typedef unsigned __int64 uint64_t; -#endif - -#endif /* !_WIN32 */ - typedef struct { uint64_t high; uint64_t low; |