Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src Go back to just using normal visibility for the locale symbo...



details:   https://anonhg.NetBSD.org/src/rev/189f8e7a57f8
branches:  trunk
changeset: 815104:189f8e7a57f8
user:      joerg <joerg%NetBSD.org@localhost>
date:      Fri Apr 29 16:26:48 2016 +0000

description:
Go back to just using normal visibility for the locale symbols. Without
an actual specifier like dllimport, protected visibility is unusable.

diffstat:

 include/locale.h                  |  10 +---------
 lib/libc/locale/global_locale.c   |  10 ++--------
 lib/libc/locale/setlocale_local.h |   5 +----
 3 files changed, 4 insertions(+), 21 deletions(-)

diffs (87 lines):

diff -r d11c79a3572d -r 189f8e7a57f8 include/locale.h
--- a/include/locale.h  Fri Apr 29 16:25:55 2016 +0000
+++ b/include/locale.h  Fri Apr 29 16:26:48 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: locale.h,v 1.27 2016/03/17 17:36:32 christos Exp $     */
+/*     $NetBSD: locale.h,v 1.28 2016/04/29 16:26:48 joerg Exp $        */
 
 /*
  * Copyright (c) 1991, 1993
@@ -106,20 +106,12 @@
 struct lconv   *localeconv_l(locale_t);
 locale_t       newlocale(int, const char *, locale_t);
 
-#ifdef __clang__
 extern                struct _locale   _lc_global_locale;
-#else
-extern __dso_protected struct _locale  _lc_global_locale;
-#endif
 #define LC_GLOBAL_LOCALE       (&_lc_global_locale)
 #endif /* _POSIX_SOURCE >= 200809 || _NETBSD_SOURCE */
 
 #if defined(_NETBSD_SOURCE)
-#ifdef __clang__
 extern                const struct _locale _lc_C_locale;
-#else
-extern __dso_protected const struct _locale _lc_C_locale;
-#endif
 #define LC_C_LOCALE            ((locale_t)__UNCONST(&_lc_C_locale))
 #endif
 __END_DECLS
diff -r d11c79a3572d -r 189f8e7a57f8 lib/libc/locale/global_locale.c
--- a/lib/libc/locale/global_locale.c   Fri Apr 29 16:25:55 2016 +0000
+++ b/lib/libc/locale/global_locale.c   Fri Apr 29 16:26:48 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: global_locale.c,v 1.24 2016/03/17 17:38:14 christos Exp $ */
+/* $NetBSD: global_locale.c,v 1.25 2016/04/29 16:26:48 joerg Exp $ */
 
 /*-
  * Copyright (c)2008 Citrus Project,
@@ -28,7 +28,7 @@
 
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: global_locale.c,v 1.24 2016/03/17 17:38:14 christos Exp $");
+__RCSID("$NetBSD: global_locale.c,v 1.25 2016/04/29 16:26:48 joerg Exp $");
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
@@ -143,9 +143,6 @@
     .numeric_name = _lc_C_locale_name,
 };
 
-#ifndef __clang__
-__dso_protected
-#endif
 struct _locale _lc_global_locale = {
     .cache = &_C_cache,
     .query = { _C_LOCALE },
@@ -174,9 +171,6 @@
     },
 };
 
-#ifndef __clang__
-__dso_protected
-#endif
 const struct _locale _lc_C_locale = {
     .cache = &_C_cache,
     .query = { _C_LOCALE },
diff -r d11c79a3572d -r 189f8e7a57f8 lib/libc/locale/setlocale_local.h
--- a/lib/libc/locale/setlocale_local.h Fri Apr 29 16:25:55 2016 +0000
+++ b/lib/libc/locale/setlocale_local.h Fri Apr 29 16:26:48 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: setlocale_local.h,v 1.16 2016/01/29 15:18:08 christos Exp $ */
+/* $NetBSD: setlocale_local.h,v 1.17 2016/04/29 16:26:48 joerg Exp $ */
 
 /*-
  * Copyright (c)2008 Citrus Project,
@@ -85,9 +85,6 @@
 __END_DECLS
 
 #ifdef _LIBC
-#if 0
-extern __dso_protected struct _locale  _lc_global_locale;
-#endif
 extern __dso_hidden const struct _locale_cache_t _C_cache;
 
 static __inline struct _locale *



Home | Main Index | Thread Index | Old Index