d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFV r270197:

Browse Source 
Illumos issue:
    5066 remove support for non-ANSI compilation
    5068 Remove SCCSID() macro from <macros.h>

MFC after:	2 weeks
This commit is contained in:
Xin LI 2014-08-22 22:13:36 +00:00
commit fa4484104c
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=270382
8 changed files with 55 additions and 129 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
cddl/contrib/opensolaris/head/libintl.h
View File

@ -19,6 +19,8 @@
* CDDL HEADER END
*/
/*
* Copyright 2014 Garrett D'Amore <garrett@damore.org>
*
* Copyright 2008 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@ -27,8 +29,6 @@
#ifndef _LIBINTL_H
#define _LIBINTL_H
#pragma ident "%Z%%M% %I% %E% SMI"
#include <sys/isa_defs.h>
#ifdef __cplusplus
@ -64,7 +64,6 @@ typedef long wchar_t;
#define __GNU_GETTEXT_SUPPORTED_REVISION(m) \
((((m) == 0) || ((m) == 1)) ? 1 : -1)
#ifdef __STDC__
extern char *dcgettext(const char *, const char *, const int);
extern char *dgettext(const char *, const char *);
extern char *gettext(const char *);
@ -91,33 +90,6 @@ extern wchar_t *wddelim(wchar_t, wchar_t, int);
extern wchar_t mcfiller(void);
extern int mcwrap(void);
#else
extern char *dcgettext();
extern char *dgettext();
extern char *gettext();
extern char *textdomain();
extern char *bindtextdomain();
/*
* LI18NUX 2000 Globalization Specification Version 1.0
* with Amendment 2
*/
extern char *dcngettext();
extern char *dngettext();
extern char *ngettext();
extern char *bind_textdomain_codeset();
/* Word handling functions --- requires dynamic linking */
/* Warning: these are experimental and subject to change. */
extern int wdinit();
extern int wdchkind();
extern int wdbindf();
extern wchar_t *wddelim();
extern wchar_t mcfiller();
extern int mcwrap();
#endif
#ifdef __cplusplus
}
#endif

9
cddl/contrib/opensolaris/head/nlist.h
View File

@ -19,6 +19,9 @@
*
* CDDL HEADER END
*/
/*
* Copyright 2014 Garrett D'Amore <garrett@damore.org>
*/
/* Copyright (c) 1988 AT&T */
/* All Rights Reserved */
@ -26,8 +29,6 @@
#ifndef _NLIST_H
#define _NLIST_H
#pragma ident "%Z%%M% %I% %E% SMI" /* SVr4.0 1.8.2.4 */
#ifdef __cplusplus
extern "C" {
#endif
@ -41,11 +42,7 @@ struct nlist {
char n_numaux; /* number of aux. entries */
};
#if defined(__STDC__)
extern int nlist(const char *, struct nlist *);
#else /* __STDC__ */
extern int nlist();
#endif /* __STDC__ */
#ifdef __cplusplus
}

61
cddl/contrib/opensolaris/head/synch.h
View File

@ -20,6 +20,7 @@
*/
/*
* Copyright 2014 Garrett D'Amore <garrett@damore.org>
* Copyright (c) 1992, 2010, Oracle and/or its affiliates. All rights reserved.
*/
@ -86,7 +87,6 @@ typedef struct _rwlock {
cond_t writercv; /* used only to indicate ownership */
} rwlock_t;
#ifdef __STDC__
int _lwp_mutex_lock(lwp_mutex_t *);
int _lwp_mutex_unlock(lwp_mutex_t *);
int _lwp_mutex_trylock(lwp_mutex_t *);
@ -127,50 +127,6 @@ int sema_reltimedwait(sema_t *, const timespec_t *);
int sema_post(sema_t *);
int sema_trywait(sema_t *);
#else /* __STDC__ */
int _lwp_mutex_lock();
int _lwp_mutex_unlock();
int _lwp_mutex_trylock();
int _lwp_cond_wait();
int _lwp_cond_timedwait();
int _lwp_cond_reltimedwait();
int _lwp_cond_signal();
int _lwp_cond_broadcast();
int _lwp_sema_init();
int _lwp_sema_wait();
int _lwp_sema_trywait();
int _lwp_sema_post();
int cond_init();
int cond_destroy();
int cond_wait();
int cond_timedwait();
int cond_reltimedwait();
int cond_signal();
int cond_broadcast();
int mutex_init();
int mutex_destroy();
int mutex_consistent();
int mutex_lock();
int mutex_trylock();
int mutex_unlock();
int rwlock_init();
int rwlock_destroy();
int rw_rdlock();
int rw_wrlock();
int rw_unlock();
int rw_tryrdlock();
int rw_trywrlock();
int sema_init();
int sema_destroy();
int sema_wait();
int sema_timedwait();
int sema_reltimedwait();
int sema_post();
int sema_trywait();
#endif /* __STDC__ */
#endif /* _ASM */
/* "Magic numbers" tagging synchronization object types */
@ -238,8 +194,6 @@ int sema_trywait();
#ifndef _ASM
#ifdef __STDC__
/*
* The *_held() functions apply equally well to Solaris threads
* and to Posix threads synchronization objects, but the formal
@ -252,21 +206,8 @@ int _rw_read_held(void *); /* rwlock_t or pthread_rwlock_t */
int _rw_write_held(void *); /* rwlock_t or pthread_rwlock_t */
int _mutex_held(void *); /* mutex_t or pthread_mutex_t */
#else /* __STDC__ */
int _sema_held();
int _rw_read_held();
int _rw_write_held();
int _mutex_held();
#endif /* __STDC__ */
/* Pause API */
#ifdef __STDC__
void smt_pause(void);
#else /* __STDC__ */
void smt_pause();
#endif /* __STDC__ */
#endif /* _ASM */

4
cddl/contrib/opensolaris/head/thread.h
View File

@ -20,6 +20,8 @@
*/
/*
* Copyright 2014 Garrett D'Amore <garrett@damore.org>
*
* Copyright 2007 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@ -27,8 +29,6 @@
#ifndef _THREAD_H
#define _THREAD_H
#pragma ident "%Z%%M% %I% %E% SMI"
#include <pthread.h>
#include <pthread_np.h>
#include <assert.h>

7
sys/cddl/contrib/opensolaris/uts/common/sys/acl.h
View File

@ -19,6 +19,8 @@
* CDDL HEADER END
*/
/*
* Copyright 2014 Garrett D'Amore <garrett@damore.org>
*
* Copyright 2009 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@ -299,13 +301,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
}

12
sys/cddl/contrib/opensolaris/uts/common/sys/debug.h
View File

@ -19,6 +19,8 @@
* CDDL HEADER END
*/
/*
* Copyright 2014 Garrett D'Amore <garrett@damore.org>
*
* Copyright 2010 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@ -47,7 +49,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__)))
#ifdef DEBUG
@ -55,15 +56,6 @@ extern int assfail(const char *, const char *, int);
#else
#define ASSERT(x) ((void)0)
#endif
#else /* defined(__STDC__) */
extern int assfail();
#define VERIFY(EX) ((void)((EX) || assfail("EX", __FILE__, __LINE__)))
#ifdef 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

46
sys/cddl/contrib/opensolaris/uts/common/sys/feature_tests.h
View File

@ -20,6 +20,8 @@
*/
/*
* Copyright 2013 Garrett D'Amore <garrett@damore.org>
*
* Copyright 2006 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@ -42,15 +44,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.
@ -76,6 +79,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
#endif
/*
* Use strict symbol visibility.
*/
#if (defined(_STRICT_STDC) || defined(__XOPEN_OR_POSIX)) && \
!defined(__EXTENSIONS__)
#define _STRICT_SYMBOLS
#endif
/*
* Large file interfaces:
*
@ -223,6 +238,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,
@ -230,6 +247,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
@ -242,6 +260,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
@ -261,6 +280,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 */
@ -295,6 +315,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
/*
@ -305,12 +338,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

13
sys/cddl/contrib/opensolaris/uts/common/sys/processor.h
View File

@ -25,6 +25,8 @@
*/
/*
* Copyright 2014 Garrett D'Amore <garrett@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 idtype, id_t id,
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 */
/*