diff options
| author | Jose <jose@zeroc.com> | 2016-06-15 18:06:00 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2016-06-15 18:06:00 +0200 |
| commit | 99855eefd7419c24e9b204fb851ec95adc581b4e (patch) | |
| tree | 0d79a68449d770c3c550b43121c0d6d43f602d14 /cpp/include/IceUtil/IconvStringConverter.h | |
| parent | Allow java libraries to override pom scm data (diff) | |
| parent | Stack trace test expec files for Linux (diff) | |
| download | ice-99855eefd7419c24e9b204fb851ec95adc581b4e.tar.bz2 ice-99855eefd7419c24e9b204fb851ec95adc581b4e.tar.xz ice-99855eefd7419c24e9b204fb851ec95adc581b4e.zip | |
Merge branch '3.6-stretch' into 3.6
Diffstat (limited to 'cpp/include/IceUtil/IconvStringConverter.h')
| -rw-r--r-- | cpp/include/IceUtil/IconvStringConverter.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/include/IceUtil/IconvStringConverter.h b/cpp/include/IceUtil/IconvStringConverter.h index 4281eb89aff..95a4c4120fd 100644 --- a/cpp/include/IceUtil/IconvStringConverter.h +++ b/cpp/include/IceUtil/IconvStringConverter.h @@ -18,7 +18,7 @@ #include <langinfo.h> #include <string.h> // For strerror -#if (defined(__APPLE__) && _LIBICONV_VERSION < 0x010B) || defined(__FreeBSD__) +#if (defined(__APPLE__) && _LIBICONV_VERSION < 0x010B) // // See http://sourceware.org/bugzilla/show_bug.cgi?id=2962 // |