aboutsummaryrefslogtreecommitdiff
path: root/cddl/contrib/opensolaris/head
diff options
context:
space:
mode:
authorXin LI <delphij@FreeBSD.org>2014-08-22 22:13:36 +0000
committerXin LI <delphij@FreeBSD.org>2014-08-22 22:13:36 +0000
commitfa4484104cbbfaa9705492ee22426c46c46ac182 (patch)
tree7f14183867d68b27aa9be479a4002303c12cce37 /cddl/contrib/opensolaris/head
parent4ddb46f694a0db537f093297b7d00b46181aa00e (diff)
parenta04032b50f086d6a47f8e444b721a52d737d2217 (diff)
downloadsrc-fa4484104cbbfaa9705492ee22426c46c46ac182.tar.gz
src-fa4484104cbbfaa9705492ee22426c46c46ac182.zip
MFV r270197:
Illumos issue: 5066 remove support for non-ANSI compilation 5068 Remove SCCSID() macro from <macros.h> MFC after: 2 weeks
Notes
Notes: svn path=/head/; revision=270382
Diffstat (limited to 'cddl/contrib/opensolaris/head')
-rw-r--r--cddl/contrib/opensolaris/head/libintl.h32
-rw-r--r--cddl/contrib/opensolaris/head/nlist.h9
-rw-r--r--cddl/contrib/opensolaris/head/synch.h61
-rw-r--r--cddl/contrib/opensolaris/head/thread.h4
4 files changed, 8 insertions, 98 deletions
diff --git a/cddl/contrib/opensolaris/head/libintl.h b/cddl/contrib/opensolaris/head/libintl.h
index e649668e1225..262fa89a1722 100644
--- a/cddl/contrib/opensolaris/head/libintl.h
+++ b/cddl/contrib/opensolaris/head/libintl.h
@@ -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
diff --git a/cddl/contrib/opensolaris/head/nlist.h b/cddl/contrib/opensolaris/head/nlist.h
index ea1bd203bb31..de6be5e18444 100644
--- a/cddl/contrib/opensolaris/head/nlist.h
+++ b/cddl/contrib/opensolaris/head/nlist.h
@@ -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
}
diff --git a/cddl/contrib/opensolaris/head/synch.h b/cddl/contrib/opensolaris/head/synch.h
index 89efe9c687ac..c0f68f12f008 100644
--- a/cddl/contrib/opensolaris/head/synch.h
+++ b/cddl/contrib/opensolaris/head/synch.h
@@ -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 */
diff --git a/cddl/contrib/opensolaris/head/thread.h b/cddl/contrib/opensolaris/head/thread.h
index d813a25dd4bc..be58e1cf4183 100644
--- a/cddl/contrib/opensolaris/head/thread.h
+++ b/cddl/contrib/opensolaris/head/thread.h
@@ -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>