svn commit: r270197 - vendor-sys/illumos/dist/uts/common/sys vendor/illumos/dist/head
Xin LI
delphij at FreeBSD.org
Wed Aug 20 06:29:44 UTC 2014
Author: delphij
Date: Wed Aug 20 06:29:42 2014
New Revision: 270197
URL: http://svnweb.freebsd.org/changeset/base/270197
Log:
5066 remove support for non-ANSI compilation
5068 Remove SCCSID() macro from <macros.h>
Reviewed by: Keith Wesolowski <keith.wesolowski at joyent.com>
Reviewed by: Josef 'Jeff' Sipek <jeffpc at josefsipek.net>
Approved by: Robert Mustacchi <rm at joyent.com>
Author: Garrett D'Amore <garrett at damore.org>
illumos/illumos-gate at ba3594ba9b5dd4c846c472a8d657edcb7c8109ac
Modified:
vendor-sys/illumos/dist/uts/common/sys/acl.h
vendor-sys/illumos/dist/uts/common/sys/debug.h
vendor-sys/illumos/dist/uts/common/sys/feature_tests.h
vendor-sys/illumos/dist/uts/common/sys/processor.h
Changes in other areas also in this revision:
Modified:
vendor/illumos/dist/head/libintl.h
vendor/illumos/dist/head/nlist.h
vendor/illumos/dist/head/synch.h
vendor/illumos/dist/head/thread.h
Modified: vendor-sys/illumos/dist/uts/common/sys/acl.h
==============================================================================
--- vendor-sys/illumos/dist/uts/common/sys/acl.h Wed Aug 20 06:25:43 2014 (r270196)
+++ vendor-sys/illumos/dist/uts/common/sys/acl.h Wed Aug 20 06:29:42 2014 (r270197)
@@ -19,6 +19,8 @@
* CDDL HEADER END
*/
/*
+ * Copyright 2014 Garrett D'Amore <garrett at damore.org>
+ *
* Copyright 2009 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -287,13 +289,8 @@ extern int cmp2acls(void *, void *);
#endif /* !defined(_KERNEL) */
-#if defined(__STDC__)
extern int acl(const char *path, int cmd, int cnt, void *buf);
extern int facl(int fd, int cmd, int cnt, void *buf);
-#else /* !__STDC__ */
-extern int acl();
-extern int facl();
-#endif /* defined(__STDC__) */
#ifdef __cplusplus
}
Modified: vendor-sys/illumos/dist/uts/common/sys/debug.h
==============================================================================
--- vendor-sys/illumos/dist/uts/common/sys/debug.h Wed Aug 20 06:25:43 2014 (r270196)
+++ vendor-sys/illumos/dist/uts/common/sys/debug.h Wed Aug 20 06:29:42 2014 (r270197)
@@ -19,6 +19,8 @@
* CDDL HEADER END
*/
/*
+ * Copyright 2014 Garrett D'Amore <garrett at damore.org>
+ *
* Copyright 2010 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -48,7 +50,6 @@ extern "C" {
* ASSERT and is evaluated on both debug and non-debug kernels.
*/
-#if defined(__STDC__)
extern int assfail(const char *, const char *, int);
#define VERIFY(EX) ((void)((EX) || assfail(#EX, __FILE__, __LINE__)))
#if DEBUG
@@ -56,15 +57,6 @@ extern int assfail(const char *, const c
#else
#define ASSERT(x) ((void)0)
#endif
-#else /* defined(__STDC__) */
-extern int assfail();
-#define VERIFY(EX) ((void)((EX) || assfail("EX", __FILE__, __LINE__)))
-#if DEBUG
-#define ASSERT(EX) ((void)((EX) || assfail("EX", __FILE__, __LINE__)))
-#else
-#define ASSERT(x) ((void)0)
-#endif
-#endif /* defined(__STDC__) */
/*
* Assertion variants sensitive to the compilation data model
Modified: vendor-sys/illumos/dist/uts/common/sys/feature_tests.h
==============================================================================
--- vendor-sys/illumos/dist/uts/common/sys/feature_tests.h Wed Aug 20 06:25:43 2014 (r270196)
+++ vendor-sys/illumos/dist/uts/common/sys/feature_tests.h Wed Aug 20 06:29:42 2014 (r270197)
@@ -20,6 +20,8 @@
*/
/*
+ * Copyright 2013 Garrett D'Amore <garrett at damore.org>
+ *
* Copyright 2006 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -43,15 +45,16 @@ extern "C" {
* 199309L POSIX.1b-1993 compilation (Real Time)
* 199506L POSIX.1c-1995 compilation (POSIX Threads)
* 200112L POSIX.1-2001 compilation (Austin Group Revision)
+ * 200809L POSIX.1-2008 compilation
*/
#if defined(_POSIX_SOURCE) && !defined(_POSIX_C_SOURCE)
#define _POSIX_C_SOURCE 1
#endif
/*
- * The feature test macros __XOPEN_OR_POSIX, _STRICT_STDC, and _STDC_C99
- * are Sun implementation specific macros created in order to compress
- * common standards specified feature test macros for easier reading.
+ * The feature test macros __XOPEN_OR_POSIX, _STRICT_STDC, _STRICT_SYMBOLS,
+ * and _STDC_C99 are Sun implementation specific macros created in order to
+ * compress common standards specified feature test macros for easier reading.
* These macros should not be used by the application developer as
* unexpected results may occur. Instead, the user should reference
* standards(5) for correct usage of the standards feature test macros.
@@ -77,6 +80,10 @@ extern "C" {
* the C standard. A value of 199901L indicates a
* compiler that complies with ISO/IEC 9899:1999, other-
* wise known as the C99 standard.
+ *
+ * _STRICT_SYMBOLS Used in cases where symbol visibility is restricted
+ * by the standards, and the user has not explicitly
+ * relaxed the strictness via __EXTENSIONS__.
*/
#if defined(_XOPEN_SOURCE) || defined(_POSIX_C_SOURCE)
@@ -144,6 +151,14 @@ extern "C" {
#endif
/*
+ * Use strict symbol visibility.
+ */
+#if (defined(_STRICT_STDC) || defined(__XOPEN_OR_POSIX)) && \
+ !defined(__EXTENSIONS__)
+#define _STRICT_SYMBOLS
+#endif
+
+/*
* Large file interfaces:
*
* _LARGEFILE_SOURCE
@@ -222,6 +237,8 @@ extern "C" {
* X/Open CAE Specification, Issue 5 (XPG5)
* Open Group Technical Standard, Issue 6 (XPG6), also referred to as
* IEEE Std. 1003.1-2001 and ISO/IEC 9945:2002.
+ * Open Group Technical Standard, Issue 7 (XPG7), also referred to as
+ * IEEE Std. 1003.1-2008 and ISO/IEC 9945:2009.
*
* XPG4v2 is also referred to as UNIX 95 (SUS or SUSv1).
* XPG5 is also referred to as UNIX 98 or the Single Unix Specification,
@@ -229,6 +246,7 @@ extern "C" {
* XPG6 is the result of a merge of the X/Open and POSIX specifications
* and as such is also referred to as IEEE Std. 1003.1-2001 in
* addition to UNIX 03 and SUSv3.
+ * XPG7 is also referred to as UNIX 08 and SUSv4.
*
* When writing a conforming X/Open application, as per the specification
* requirements, the appropriate feature test macros must be defined at
@@ -241,6 +259,7 @@ extern "C" {
* _XOPEN_SOURCE && _XOPEN_SOURCE_EXTENDED = 1 XPG4v2
* _XOPEN_SOURCE = 500 XPG5
* _XOPEN_SOURCE = 600 (or POSIX_C_SOURCE=200112L) XPG6
+ * _XOPEN_SOURCE = 700 (or POSIX_C_SOURCE=200809L) XPG7
*
* In order to simplify the guards within the headers, the following
* implementation private test macros have been created. Applications
@@ -260,6 +279,7 @@ extern "C" {
* _XPG4_2 X/Open CAE Specification, Issue 4, Version 2 (XPG4v2/UNIX 95/SUS)
* _XPG5 X/Open CAE Specification, Issue 5 (XPG5/UNIX 98/SUSv2)
* _XPG6 Open Group Technical Standard, Issue 6 (XPG6/UNIX 03/SUSv3)
+ * _XPG7 Open Group Technical Standard, Issue 7 (XPG7/UNIX 08/SUSv4)
*/
/* X/Open Portability Guide, Issue 3 */
@@ -294,6 +314,19 @@ extern "C" {
#define _POSIX_C_SOURCE 200112L
#undef _XOPEN_SOURCE
#define _XOPEN_SOURCE 600
+
+/* Open Group Technical Standard, Issue 7 */
+#elif (_XOPEN_SOURCE - 0 == 700) || (_POSIX_C_SOURCE - 0 == 200809L)
+#define _XPG7
+#define _XPG6
+#define _XPG5
+#define _XPG4_2
+#define _XPG4
+#define _XPG3
+#undef _POSIX_C_SOURCE
+#define _POSIX_C_SOURCE 200809L
+#undef _XOPEN_SOURCE
+#define _XOPEN_SOURCE 700
#endif
/*
@@ -304,12 +337,15 @@ extern "C" {
* with the value of 4 indicates an XPG4 or XPG4v2 (UNIX 95) application.
* _XOPEN_VERSION defined with a value of 500 indicates an XPG5 (UNIX 98)
* application and with a value of 600 indicates an XPG6 (UNIX 03)
- * application. The appropriate version is determined by the use of the
+ * application and with a value of 700 indicates an XPG7 (UNIX 08).
+ * The appropriate version is determined by the use of the
* feature test macros described earlier. The value of _XOPEN_VERSION
* defaults to 3 otherwise indicating support for XPG3 applications.
*/
#ifndef _XOPEN_VERSION
-#ifdef _XPG6
+#if defined(_XPG7)
+#define _XOPEN_VERSION 700
+#elif defined(_XPG6)
#define _XOPEN_VERSION 600
#elif defined(_XPG5)
#define _XOPEN_VERSION 500
Modified: vendor-sys/illumos/dist/uts/common/sys/processor.h
==============================================================================
--- vendor-sys/illumos/dist/uts/common/sys/processor.h Wed Aug 20 06:25:43 2014 (r270196)
+++ vendor-sys/illumos/dist/uts/common/sys/processor.h Wed Aug 20 06:29:42 2014 (r270197)
@@ -25,6 +25,8 @@
*/
/*
+ * Copyright 2014 Garrett D'Amore <garrett at damore.org>
+ *
* Copyright 2008 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -112,7 +114,6 @@ typedef struct {
* User-level system call interface prototypes
*/
#ifndef _KERNEL
-#ifdef __STDC__
extern int p_online(processorid_t processorid, int flag);
extern int processor_info(processorid_t processorid,
@@ -122,16 +123,6 @@ extern int processor_bind(idtype_t idtyp
extern processorid_t getcpuid(void);
extern lgrpid_t gethomelgroup(void);
-#else
-
-extern int p_online();
-extern int processor_info();
-extern int processor_bind();
-extern processorid_t getcpuid();
-extern lgrpid_t gethomelgroup();
-
-#endif /* __STDC__ */
-
#else /* _KERNEL */
/*
More information about the svn-src-all
mailing list