aboutsummaryrefslogtreecommitdiffstats
path: root/head
diff options
context:
space:
mode:
authorXin LI <delphij@FreeBSD.org>2014-08-20 06:29:42 +0000
committerXin LI <delphij@FreeBSD.org>2014-08-20 06:29:42 +0000
commita04032b50f086d6a47f8e444b721a52d737d2217 (patch)
tree86e7fda464b202bd12d3167fb5c5f6f2e4fbec84 /head
parentd32314913212d4ec68aaa8a62a04f57c5f4c3cf2 (diff)
downloadsrc-a04032b50f086d6a47f8e444b721a52d737d2217.tar.gz
src-a04032b50f086d6a47f8e444b721a52d737d2217.zip
5066 remove support for non-ANSI compilation
5068 Remove SCCSID() macro from <macros.h> Reviewed by: Keith Wesolowski <keith.wesolowski@joyent.com> Reviewed by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net> Approved by: Robert Mustacchi <rm@joyent.com> Author: Garrett D'Amore <garrett@damore.org> illumos/illumos-gate@ba3594ba9b5dd4c846c472a8d657edcb7c8109ac
Notes
Notes: svn path=/vendor-sys/illumos/dist/; revision=270197
Diffstat (limited to 'head')
-rw-r--r--head/libintl.h32
-rw-r--r--head/nlist.h9
-rw-r--r--head/synch.h61
-rw-r--r--head/thread.h32
4 files changed, 8 insertions, 126 deletions
diff --git a/head/libintl.h b/head/libintl.h
index e649668e1225..262fa89a1722 100644
--- a/head/libintl.h
+++ b/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/head/nlist.h b/head/nlist.h
index ea1bd203bb31..de6be5e18444 100644
--- a/head/nlist.h
+++ b/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/head/synch.h b/head/synch.h
index 89efe9c687ac..c0f68f12f008 100644
--- a/head/synch.h
+++ b/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/head/thread.h b/head/thread.h
index 63f0b7130d8d..d0b0b3ddeb13 100644
--- a/head/thread.h
+++ b/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"
-
/*
* thread.h:
* definitions needed to use the thread interface except synchronization.
@@ -48,10 +48,6 @@ extern "C" {
#ifndef _ASM
typedef unsigned int thread_t;
typedef unsigned int thread_key_t;
-#endif /* _ASM */
-
-#ifndef _ASM
-#ifdef __STDC__
extern int thr_create(void *, size_t, void *(*)(void *), void *, long,
thread_t *);
@@ -92,30 +88,6 @@ extern int thr_setspecific(thread_key_t, void *);
extern int thr_getspecific(thread_key_t, void **);
extern size_t thr_min_stack(void);
-#else /* __STDC */
-
-extern int thr_create();
-extern int thr_join();
-extern int thr_setconcurrency();
-extern int thr_getconcurrency();
-extern void thr_exit();
-extern thread_t thr_self();
-extern int thr_sigsetmask();
-extern int thr_stksegment();
-extern int thr_main();
-extern int thr_kill();
-extern int thr_suspend();
-extern int thr_continue();
-extern void thr_yield();
-extern int thr_setprio();
-extern int thr_getprio();
-extern int thr_keycreate();
-extern int thr_keycreate_once();
-extern int thr_setspecific();
-extern int thr_getspecific();
-extern size_t thr_min_stack();
-
-#endif /* __STDC */
#endif /* _ASM */
#define THR_MIN_STACK thr_min_stack()