forked from pool/boinc-client
5a4c610a49
recover removals and undocumented changes OBS-URL: https://build.opensuse.org/request/show/520383 OBS-URL: https://build.opensuse.org/package/show/network/boinc-client?expand=0&rev=58
36 lines
1.2 KiB
Diff
36 lines
1.2 KiB
Diff
From: Jan Engelhardt <jengelh@inai.de>
|
|
Date: 2017-09-03 00:10:38.255132582 +0200
|
|
|
|
build: no more xlocale.h with glibc-2.26
|
|
---
|
|
clientgui/AsyncRPC.cpp | 2 +-
|
|
lib/gui_rpc_client.h | 2 +-
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
Index: clientgui/AsyncRPC.cpp
|
|
===================================================================
|
|
--- clientgui/AsyncRPC.cpp.orig
|
|
+++ clientgui/AsyncRPC.cpp
|
|
@@ -20,7 +20,7 @@
|
|
#endif
|
|
|
|
#if !(defined(_WIN32) || (defined(__WXMAC__) && (MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_4)))
|
|
-#include <xlocale.h>
|
|
+#include <locale.h>
|
|
#endif
|
|
|
|
#include "stdwx.h"
|
|
Index: lib/gui_rpc_client.h
|
|
===================================================================
|
|
--- lib/gui_rpc_client.h.orig
|
|
+++ lib/gui_rpc_client.h
|
|
@@ -801,7 +801,7 @@ struct RPC {
|
|
|
|
#elif defined(__APPLE__) && (MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_4)
|
|
// uselocale() is not available in OS 10.3.9 so use weak linking
|
|
-#include <xlocale.h>
|
|
+#include <locale.h>
|
|
extern int freelocale(locale_t) __attribute__((weak_import));
|
|
extern locale_t newlocale(int, __const char *, locale_t) __attribute__((weak_import));
|
|
extern locale_t uselocale(locale_t) __attribute__((weak_import));
|