# Calculate format=diff merge(media-plugins/kodi-pvr-mediaportal-tvserver)=>2.4.19,2.5 diff --git a/src/lib/live555/liveMedia/include/Locale.hh b/src/lib/live555/liveMedia/include/Locale.hh index b327948..44ea81c 100644 --- a/src/lib/live555/liveMedia/include/Locale.hh +++ b/src/lib/live555/liveMedia/include/Locale.hh @@ -43,7 +43,7 @@ along with this library; if not, write to the Free Software Foundation, Inc., #ifndef LOCALE_NOT_USED #include -#ifndef XLOCALE_NOT_USED +#if !defined(XLOCALE_NOT_USED) && (!defined(__GLIBC__) || !defined(__GLIBC_MINOR__) || __GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 26)) #include // because, on some systems, doesn't include ; this makes sure that we get both #endif #endif