diff options
| author | Manuel Klimek <klimek@google.com> | 2015-10-29 10:29:55 -0700 |
|---|---|---|
| committer | Manuel Klimek <klimek@google.com> | 2015-10-29 10:29:55 -0700 |
| commit | 0428bae673eb7b7f03ff6b8659aacda4c205c7dd (patch) | |
| tree | b69b2cfbc9419498cf1046121c1d002b7d18a10e | |
| parent | 2387d2fc7c2cb8a12f2dd4e49ccbfcd1cff652c5 (diff) | |
| download | glibc-0428bae673eb7b7f03ff6b8659aacda4c205c7dd.tar glibc-0428bae673eb7b7f03ff6b8659aacda4c205c7dd.tar.gz glibc-0428bae673eb7b7f03ff6b8659aacda4c205c7dd.tar.bz2 glibc-0428bae673eb7b7f03ff6b8659aacda4c205c7dd.zip | |
Allow suppressing the definition of __USE_FILE_OFFSET64 by defining SUPPRESS_USE_FILE_OFFSET64 in the CROSSTOOL.
| -rw-r--r-- | README.google | 7 | ||||
| -rw-r--r-- | include/features.h | 3 |
2 files changed, 9 insertions, 1 deletions
diff --git a/README.google b/README.google index 53ea5172e5..5c01f499a2 100644 --- a/README.google +++ b/README.google @@ -520,3 +520,10 @@ resolv/nss_dns/dns-network.c https://sourceware.org/git/?p=glibc.git;a=commit;h=ab7ac0f2cf8731fe4c3f3aea6088a7c0127b5725 https://sourceware.org/git/?p=glibc.git;a=commit;h=ab09bf616ad527b249aca5f2a4956fd526f0712f (stanshebs, backport) + +include/features.h + Allow suppressing the definition of __USE_FILE_OFFSET64 by defining + SUPPRESS_USE_FILE_OFFSET64. As large file types match the default + types, this is irrelevant in Google's depot, but leads to different type + signatures for functions that are problematic with C++ modules. + (klimek, google-local) diff --git a/include/features.h b/include/features.h index f730ca0f33..83459760a2 100644 --- a/include/features.h +++ b/include/features.h @@ -308,7 +308,8 @@ # define __USE_LARGEFILE64 1 #endif -#if defined _FILE_OFFSET_BITS && _FILE_OFFSET_BITS == 64 +#if !(defined SUPPRESS_USE_FILE_OFFSET64) && defined _FILE_OFFSET_BITS && \ + _FILE_OFFSET_BITS == 64 # define __USE_FILE_OFFSET64 1 #endif |