From e599318e912d8836c59d8b5202e3e31a6b8dcae9 Mon Sep 17 00:00:00 2001
From: Sebastian Huber <sebastian.huber@embedded-brains.de>
Date: Wed, 9 Oct 2013 22:52:54 +0200
Subject: Update files to match FreeBSD layout

Add compatibility with Newlib header files.  Some FreeBSD header files
are mapped by the translation script:

     o rtems/bsd/sys/_types.h
     o rtems/bsd/sys/errno.h
     o rtems/bsd/sys/lock.h
     o rtems/bsd/sys/param.h
     o rtems/bsd/sys/resource.h
     o rtems/bsd/sys/time.h
     o rtems/bsd/sys/timespec.h
     o rtems/bsd/sys/types.h
     o rtems/bsd/sys/unistd.h

It is now possible to include <sys/socket.h> directly for example.

Generate one Makefile which builds everything including tests.
---
 freebsd/lib/libutil/expand_number.c   | 2 +-
 freebsd/lib/libutil/humanize_number.c | 2 +-
 freebsd/lib/libutil/trimdomain.c      | 5 +----
 3 files changed, 3 insertions(+), 6 deletions(-)

(limited to 'freebsd/lib/libutil')

diff --git a/freebsd/lib/libutil/expand_number.c b/freebsd/lib/libutil/expand_number.c
index 4c8d6f5b..6047bba5 100644
--- a/freebsd/lib/libutil/expand_number.c
+++ b/freebsd/lib/libutil/expand_number.c
@@ -28,7 +28,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <sys/types.h>
+#include <rtems/bsd/sys/types.h>
 #include <ctype.h>
 #include <errno.h>
 #include <inttypes.h>
diff --git a/freebsd/lib/libutil/humanize_number.c b/freebsd/lib/libutil/humanize_number.c
index de985870..e58668b7 100644
--- a/freebsd/lib/libutil/humanize_number.c
+++ b/freebsd/lib/libutil/humanize_number.c
@@ -33,7 +33,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <sys/types.h>
+#include <rtems/bsd/sys/types.h>
 #include <assert.h>
 #include <inttypes.h>
 #include <stdio.h>
diff --git a/freebsd/lib/libutil/trimdomain.c b/freebsd/lib/libutil/trimdomain.c
index 7ca6ab69..67d835f2 100644
--- a/freebsd/lib/libutil/trimdomain.c
+++ b/freebsd/lib/libutil/trimdomain.c
@@ -1,6 +1,3 @@
-#ifdef __rtems__
-#include "port_before.h"
-#endif
 /*-
  * Copyright (c) 2001 Brian Somers <brian@Awfulhak.org>
  *   Based on original work by Atsushi Murai <amurai@FreeBSD.org>
@@ -32,7 +29,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <sys/param.h>
+#include <rtems/bsd/sys/param.h>
 
 #include <libutil.h>
 #include <string.h>
-- 
cgit v1.2.3