2964 need POSIX 2008 locale object support (more C++ fixes)

illumos · Jul 16, 2014 · 732efd5 · 732efd5
1 parent fec13dd
commit 732efd5
Show file tree

Hide file tree

Showing 12 changed files with 13 additions and 13 deletions.
diff --git a/usr/src/head/ctype.h b/usr/src/head/ctype.h
@@ -94,7 +94,7 @@ extern int _toupper(int);
 
 #ifndef _LOCALE_T
 #define	_LOCALE_T
-typedef struct locale *locale_t;
+typedef struct _locale *locale_t;
 #endif
 
 extern int isalnum_l(int, locale_t);

diff --git a/usr/src/head/langinfo.h b/usr/src/head/langinfo.h
@@ -155,7 +155,7 @@ char   *nl_langinfo();		/* get a string from the database	*/
 #if defined(_XPG7) || !defined(_STRICT_SYMBOLS)
 #ifndef	_LOCALE_T
 #define	_LOCALE_T
-typedef struct locale *locale_t;
+typedef struct _locale *locale_t;
 #endif
 
 #if defined(__STDC__)

diff --git a/usr/src/head/locale.h b/usr/src/head/locale.h
@@ -81,7 +81,7 @@ extern "C" {
 
 #ifndef _LOCALE_T
 #define	_LOCALE_T
-typedef struct locale *locale_t;
+typedef struct _locale *locale_t;
 #endif
 
 #if	defined(__STDC__)

diff --git a/usr/src/head/monetary.h b/usr/src/head/monetary.h
@@ -45,7 +45,7 @@ extern ssize_t	strfmon(char *_RESTRICT_KYWD, size_t,
 
 #ifndef _LOCALE_T
 #define	_LOCALE_T
-typedef struct locale *locale_t;
+typedef struct _locale *locale_t;
 #endif
 
 extern ssize_t strfmon_l(char *_RESTRICT_KYWD, size_t, locale_t,

diff --git a/usr/src/head/string.h b/usr/src/head/string.h
@@ -97,7 +97,7 @@ extern char *strsignal(int);
 
 #ifndef	_LOCALE_T
 #define	_LOCALE_T
-typedef struct locale *locale_t;
+typedef struct _locale *locale_t;
 #endif
 
 extern int strcoll_l(const char *, const char *, locale_t);

diff --git a/usr/src/head/strings.h b/usr/src/head/strings.h
@@ -67,7 +67,7 @@ extern int strncasecmp(const char *, const char *, size_t);
 #if defined(_XPG7)
 #ifndef	_LOCALE_T
 #define	_LOCALE_T
-typedef struct locale *locale_t;
+typedef struct _locale *locale_t;
 #endif
 extern int strcasecmp_l(const char *, const char *, locale_t);
 extern int strncasecmp_l(const char *, const char *, size_t, locale_t);

diff --git a/usr/src/head/time.h b/usr/src/head/time.h
@@ -377,7 +377,7 @@ extern char *ctime_r();
 
 #ifndef	_LOCALE_T
 #define	_LOCALE_T
-typedef struct locale *locale_t;
+typedef struct _locale *locale_t;
 #endif
 
 #if	defined(__STDC__)

diff --git a/usr/src/head/wchar.h b/usr/src/head/wchar.h
@@ -172,7 +172,7 @@ using std::wctype;
 
 #ifndef _LOCALE_T
 #define	_LOCALE_T
-typedef struct locale *locale_t;
+typedef struct _locale *locale_t;
 #endif
 
 extern size_t wcsnlen(const wchar_t *, size_t);

diff --git a/usr/src/head/wctype.h b/usr/src/head/wctype.h
@@ -147,7 +147,7 @@ extern	int iswspecial();
 
 #ifndef	_LOCALE_T
 #define	_LOCALE_T
-typedef struct locale *locale_t;
+typedef struct _locale *locale_t;
 #endif
 
 #if	defined(__STDC__)

diff --git a/usr/src/head/xlocale.h b/usr/src/head/xlocale.h
@@ -45,7 +45,7 @@ extern "C" {
 
 #ifndef	_LOCALE_T
 #define	_LOCALE_T
-typedef struct locale *locale_t;
+typedef struct _locale *locale_t;
 #endif
 
 extern int mbsinit_l(const mbstate_t *, locale_t);

diff --git a/usr/src/lib/libc/port/locale/localeimpl.c b/usr/src/lib/libc/port/locale/localeimpl.c
@@ -98,7 +98,7 @@ extern struct lc_time lc_time_posix;
 extern struct lc_ctype lc_ctype_posix;
 extern struct lc_collate lc_collate_posix;
 
-static struct locale posix_locale = {
+static struct _locale posix_locale = {
 	/* locdata */
 	.locdata = {
 		&__posix_ctype_locdata,

diff --git a/usr/src/lib/libc/port/locale/localeimpl.h b/usr/src/lib/libc/port/locale/localeimpl.h
@@ -55,9 +55,9 @@ struct locdata {
 };
 
 
-struct locale {
+struct _locale {
 	struct locdata	*locdata[LC_ALL];
-	struct locale	*next;
+	struct _locale	*next;
 	int		on_list;	/* on linked list */
 	char		locname[(ENCODING_LEN+1)*NLOCDATA + 1];