Fix files that included the posix scheduling headers that were merged earlier.
authorJoe Talbott <josepht@dragonflybsd.org>
Tue, 26 Jun 2007 23:30:05 +0000 (23:30 +0000)
committerJoe Talbott <josepht@dragonflybsd.org>
Tue, 26 Jun 2007 23:30:05 +0000 (23:30 +0000)
14 files changed:
include/Makefile
include/pthread.h
lib/libc_r/test/mutex_d.c
lib/libc_r/test/sem_d.c
lib/libc_r/uthread/pthread_private.h
lib/libc_r/uthread/uthread_sem.c
lib/libc_r/uthread/uthread_spinlock.c
lib/libthread_xu/thread/thr_private.h
lib/libthread_xu/thread/thr_sem.c
tools/regression/p1003_1b/fifo.c
tools/regression/p1003_1b/prutil.c
tools/regression/p1003_1b/sched.c
tools/regression/p1003_1b/yield.c
usr.sbin/clog/clog.c

index 8c0bdf9..5bf23b9 100644 (file)
@@ -1,6 +1,6 @@
 #      @(#)Makefile    8.2 (Berkeley) 1/4/94
 # $FreeBSD: src/include/Makefile,v 1.109.2.27 2003/01/24 05:12:29 sam Exp $
 #      @(#)Makefile    8.2 (Berkeley) 1/4/94
 # $FreeBSD: src/include/Makefile,v 1.109.2.27 2003/01/24 05:12:29 sam Exp $
-# $DragonFly: src/include/Makefile,v 1.34 2007/06/16 19:57:11 dillon Exp $
+# $DragonFly: src/include/Makefile,v 1.35 2007/06/26 23:30:05 josepht Exp $
 #
 # Doing a make install builds /usr/include
 #
 #
 # Doing a make install builds /usr/include
 #
@@ -48,7 +48,6 @@ LDIRS=        net netgraph netinet netinet6 sys vm
 # when buildworld is run.
 #
 LSUBDIRS=      bus/cam bus/cam/scsi \
 # when buildworld is run.
 #
 LSUBDIRS=      bus/cam bus/cam/scsi \
-       emulation/posix4 \
        emulation/linux \
        vfs/msdosfs vfs/nfs vfs/ntfs vfs/nwfs \
        vfs/smbfs vfs/udf vfs/ufs \
        emulation/linux \
        vfs/msdosfs vfs/nfs vfs/ntfs vfs/nwfs \
        vfs/smbfs vfs/udf vfs/ufs \
index cc7c789..b623804 100644 (file)
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/include/pthread.h,v 1.20.2.4 2003/05/27 18:18:01 jdp Exp $
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/include/pthread.h,v 1.20.2.4 2003/05/27 18:18:01 jdp Exp $
- * $DragonFly: src/include/pthread.h,v 1.9 2006/04/06 13:00:44 davidxu Exp $
+ * $DragonFly: src/include/pthread.h,v 1.10 2007/06/26 23:30:05 josepht Exp $
  */
 #ifndef _PTHREAD_H_
 #define _PTHREAD_H_
  */
 #ifndef _PTHREAD_H_
 #define _PTHREAD_H_
@@ -44,7 +44,7 @@
 #include <sys/time.h>
 #include <sys/signal.h>
 #include <limits.h>
 #include <sys/time.h>
 #include <sys/signal.h>
 #include <limits.h>
-#include <sched.h>
+#include <sys/sched.h>
 
 /*
  * Run-time invariant values:
 
 /*
  * Run-time invariant values:
index 8823a14..466f453 100644 (file)
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/lib/libc_r/test/mutex_d.c,v 1.1.2.2 2003/01/05 19:59:39 semenu Exp $
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/lib/libc_r/test/mutex_d.c,v 1.1.2.2 2003/01/05 19:59:39 semenu Exp $
- * $DragonFly: src/lib/libc_r/test/mutex_d.c,v 1.2 2003/06/17 04:26:48 dillon Exp $
+ * $DragonFly: src/lib/libc_r/test/mutex_d.c,v 1.3 2007/06/26 23:30:05 josepht Exp $
  */
 #include <stdlib.h>
 #include <unistd.h>
  */
 #include <stdlib.h>
 #include <unistd.h>
@@ -39,7 +39,7 @@
 #include <assert.h>
 #include <errno.h>
 #include "pthread.h"
 #include <assert.h>
 #include <errno.h>
 #include "pthread.h"
-#include <sched.h>
+#include <sys/sched.h>
 #include <signal.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <signal.h>
 #include <stdarg.h>
 #include <stdio.h>
index cd9d2ca..5ae8919 100644 (file)
  * sem test.
  *
  * $FreeBSD: src/lib/libc_r/test/sem_d.c,v 1.1.2.2 2001/06/22 21:44:27 jasone Exp $
  * sem test.
  *
  * $FreeBSD: src/lib/libc_r/test/sem_d.c,v 1.1.2.2 2001/06/22 21:44:27 jasone Exp $
- * $DragonFly: src/lib/libc_r/test/sem_d.c,v 1.2 2003/06/17 04:26:48 dillon Exp $
+ * $DragonFly: src/lib/libc_r/test/sem_d.c,v 1.3 2007/06/26 23:30:05 josepht Exp $
  *
  ****************************************************************************/
 
  *
  ****************************************************************************/
 
+#include <sys/semaphore.h>
+
 #include <assert.h>
 #include <stdio.h>
 #include <fcntl.h>
 #include <errno.h>
 #include <assert.h>
 #include <stdio.h>
 #include <fcntl.h>
 #include <errno.h>
-#include <semaphore.h>
 #include <pthread.h>
 
 #define NTHREADS 10
 #include <pthread.h>
 
 #define NTHREADS 10
index f0b0812..fc5ea9e 100644 (file)
@@ -32,7 +32,7 @@
  * Private thread definitions for the uthread kernel.
  *
  * $FreeBSD: src/lib/libc_r/uthread/pthread_private.h,v 1.36.2.21 2002/10/22 14:44:02 fjoe Exp $
  * Private thread definitions for the uthread kernel.
  *
  * $FreeBSD: src/lib/libc_r/uthread/pthread_private.h,v 1.36.2.21 2002/10/22 14:44:02 fjoe Exp $
- * $DragonFly: src/lib/libc_r/uthread/pthread_private.h,v 1.12 2007/01/08 21:41:53 dillon Exp $
+ * $DragonFly: src/lib/libc_r/uthread/pthread_private.h,v 1.13 2007/06/26 23:30:05 josepht Exp $
  */
 
 #ifndef _PTHREAD_PRIVATE_H
  */
 
 #ifndef _PTHREAD_PRIVATE_H
@@ -57,7 +57,7 @@
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/cdefs.h>
-#include <sched.h>
+#include <sys/sched.h>
 #include <spinlock.h>
 #include <pthread_np.h>
 
 #include <spinlock.h>
 #include <pthread_np.h>
 
index 670eece..1c6567f 100644 (file)
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/lib/libc_r/uthread/uthread_sem.c,v 1.3.2.5 2002/10/22 14:44:03 fjoe Exp $
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/lib/libc_r/uthread/uthread_sem.c,v 1.3.2.5 2002/10/22 14:44:03 fjoe Exp $
- * $DragonFly: src/lib/libc_r/uthread/uthread_sem.c,v 1.3 2005/05/30 20:50:53 joerg Exp $
+ * $DragonFly: src/lib/libc_r/uthread/uthread_sem.c,v 1.4 2007/06/26 23:30:05 josepht Exp $
  */
 
  */
 
+#include <sys/semaphore.h>
+
 #include <stdlib.h>
 #include <errno.h>
 #include <stdlib.h>
 #include <errno.h>
-#include <semaphore.h>
 #include <pthread.h>
 #include <pthread.h>
+
 #include "pthread_private.h"
 
 #define _SEM_CHECK_VALIDITY(sem)               \
 #include "pthread_private.h"
 
 #define _SEM_CHECK_VALIDITY(sem)               \
index 2b999b5..14d88ff 100644 (file)
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/lib/libc_r/uthread/uthread_spinlock.c,v 1.8.2.2 2002/10/17 19:37:39 fjoe Exp $
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/lib/libc_r/uthread/uthread_spinlock.c,v 1.8.2.2 2002/10/17 19:37:39 fjoe Exp $
- * $DragonFly: src/lib/libc_r/uthread/uthread_spinlock.c,v 1.5 2007/01/08 21:41:53 dillon Exp $
+ * $DragonFly: src/lib/libc_r/uthread/uthread_spinlock.c,v 1.6 2007/06/26 23:30:05 josepht Exp $
  *
  */
 
 #include <sys/fcntl.h>
 #include <stdio.h>
  *
  */
 
 #include <sys/fcntl.h>
 #include <stdio.h>
-#include <sched.h>
+#include <sys/sched.h>
 #include <unistd.h>
 #include <pthread.h>
 #include <string.h>
 #include <unistd.h>
 #include <pthread.h>
 #include <string.h>
index 3fc1874..f2362ec 100644 (file)
@@ -32,7 +32,7 @@
  * Private thread definitions for the uthread kernel.
  *
  * $FreeBSD: src/lib/libpthread/thread/thr_private.h,v 1.120 2004/11/01 10:49:34 davidxu Exp $
  * Private thread definitions for the uthread kernel.
  *
  * $FreeBSD: src/lib/libpthread/thread/thr_private.h,v 1.120 2004/11/01 10:49:34 davidxu Exp $
- * $DragonFly: src/lib/libthread_xu/thread/thr_private.h,v 1.16 2007/05/03 23:08:34 dillon Exp $
+ * $DragonFly: src/lib/libthread_xu/thread/thr_private.h,v 1.17 2007/06/26 23:30:05 josepht Exp $
  */
 
 #ifndef _THR_PRIVATE_H
  */
 
 #ifndef _THR_PRIVATE_H
@@ -50,7 +50,7 @@
 #include <limits.h>
 #include <signal.h>
 #include <stdio.h>
 #include <limits.h>
 #include <signal.h>
 #include <stdio.h>
-#include <sched.h>
+#include <sys/sched.h>
 #include <unistd.h>
 #include <pthread.h>
 #include <pthread_np.h>
 #include <unistd.h>
 #include <pthread.h>
 #include <pthread_np.h>
index e875298..34ca47d 100644 (file)
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $DragonFly: src/lib/libthread_xu/thread/thr_sem.c,v 1.5 2006/04/06 13:03:09 davidxu Exp $
+ * $DragonFly: src/lib/libthread_xu/thread/thr_sem.c,v 1.6 2007/06/26 23:30:05 josepht Exp $
  */
 
 #include "namespace.h"
 #include <machine/tls.h>
  */
 
 #include "namespace.h"
 #include <machine/tls.h>
+#include <sys/semaphore.h>
 
 #include <errno.h>
 #include <fcntl.h>
 #include <pthread.h>
 
 #include <errno.h>
 #include <fcntl.h>
 #include <pthread.h>
-#include <semaphore.h>
 #include <stdlib.h>
 #include <time.h>
 #include "un-namespace.h"
 #include <stdlib.h>
 #include <time.h>
 #include "un-namespace.h"
index 9cd4eab..a34e0dc 100644 (file)
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/tools/regression/p1003_1b/fifo.c,v 1.1 2000/02/16 14:28:40 dufault Exp $
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/tools/regression/p1003_1b/fifo.c,v 1.1 2000/02/16 14:28:40 dufault Exp $
- * $DragonFly: src/tools/regression/p1003_1b/fifo.c,v 1.2 2003/06/17 04:29:11 dillon Exp $
+ * $DragonFly: src/tools/regression/p1003_1b/fifo.c,v 1.3 2007/06/26 23:30:05 josepht Exp $
  */
 #include <unistd.h>
 #include <stdlib.h>
  */
 #include <unistd.h>
 #include <stdlib.h>
@@ -41,7 +41,7 @@
 #include <sys/types.h>
 #include <sys/mman.h>
 #include <sys/time.h>
 #include <sys/types.h>
 #include <sys/mman.h>
 #include <sys/time.h>
-#include <sched.h>
+#include <sys/sched.h>
 #include <signal.h>
 
 volatile int ticked;
 #include <signal.h>
 
 volatile int ticked;
index 12dd39f..948f3ce 100644 (file)
@@ -1,6 +1,6 @@
 #include <errno.h>
 #include <unistd.h>
 #include <errno.h>
 #include <unistd.h>
-#include <sched.h>
+#include <sys/sched.h>
 #include <stdio.h>
 
 #include <err.h>
 #include <stdio.h>
 
 #include <err.h>
@@ -9,7 +9,7 @@
 
 /*
  * $FreeBSD: src/tools/regression/p1003_1b/prutil.c,v 1.1 2000/02/16 14:28:41 dufault Exp $
 
 /*
  * $FreeBSD: src/tools/regression/p1003_1b/prutil.c,v 1.1 2000/02/16 14:28:41 dufault Exp $
- * $DragonFly: src/tools/regression/p1003_1b/prutil.c,v 1.2 2003/06/17 04:29:11 dillon Exp $
+ * $DragonFly: src/tools/regression/p1003_1b/prutil.c,v 1.3 2007/06/26 23:30:05 josepht Exp $
  */
 void quit(const char *text)
 {
  */
 void quit(const char *text)
 {
index b2a6f24..b921e3d 100644 (file)
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * $FreeBSD: src/tools/regression/p1003_1b/sched.c,v 1.1 2000/02/16 14:28:42 dufault Exp $
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * $FreeBSD: src/tools/regression/p1003_1b/sched.c,v 1.1 2000/02/16 14:28:42 dufault Exp $
- * $DragonFly: src/tools/regression/p1003_1b/sched.c,v 1.2 2003/06/17 04:29:11 dillon Exp $
+ * $DragonFly: src/tools/regression/p1003_1b/sched.c,v 1.3 2007/06/26 23:30:05 josepht Exp $
  *
  */
 
  *
  */
 
@@ -51,7 +51,7 @@
 #include <fcntl.h>
 #include <sys/mman.h>
 
 #include <fcntl.h>
 #include <sys/mman.h>
 
-#include <sched.h>
+#include <sys/sched.h>
 
 #include "prutil.h"
 
 
 #include "prutil.h"
 
index 01dd547..1a002fc 100644 (file)
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * $FreeBSD: src/tools/regression/p1003_1b/yield.c,v 1.1 2000/02/16 14:28:42 dufault Exp $
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * $FreeBSD: src/tools/regression/p1003_1b/yield.c,v 1.1 2000/02/16 14:28:42 dufault Exp $
- * $DragonFly: src/tools/regression/p1003_1b/yield.c,v 1.2 2003/06/17 04:29:11 dillon Exp $
+ * $DragonFly: src/tools/regression/p1003_1b/yield.c,v 1.3 2007/06/26 23:30:05 josepht Exp $
  *
  */
 #include <sys/types.h>
  *
  */
 #include <sys/types.h>
@@ -41,7 +41,7 @@
 #include <fcntl.h>
 #include <sys/types.h>
 #include <sys/mman.h>
 #include <fcntl.h>
 #include <sys/types.h>
 #include <sys/mman.h>
-#include <sched.h>
+#include <sys/sched.h>
 #include <stdlib.h>
 #include <sys/wait.h>
 
 #include <stdlib.h>
 #include <sys/wait.h>
 
index ae38aee..3feaab5 100644 (file)
@@ -25,7 +25,7 @@
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $Id: clog.c,v 1.3 2001/10/02 18:51:26 jdw Exp $
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $Id: clog.c,v 1.3 2001/10/02 18:51:26 jdw Exp $
- * $DragonFly: src/usr.sbin/clog/clog.c,v 1.3 2005/12/05 01:04:00 swildner Exp $
+ * $DragonFly: src/usr.sbin/clog/clog.c,v 1.4 2007/06/26 23:30:05 josepht Exp $
  */
 
 
  */
 
 
@@ -33,7 +33,6 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <poll.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <poll.h>
-#include <sched.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -41,6 +40,7 @@
 #include <unistd.h>
 
 #include <sys/mman.h>
 #include <unistd.h>
 
 #include <sys/mman.h>
+#include <sys/sched.h>
 #include <sys/stat.h>
 #include <sys/uio.h>
 
 #include <sys/stat.h>
 #include <sys/uio.h>