2011-09-30 Ralf Corsépius <ralf.corsepius@rtems.org>

	* fserror/test.c, fslink/test.c, fspatheval/test.c,
	fspermission/test.c, fsrdwr/init.c, fssymlink/test.c,
	fstime/test.c, support/fstest_support.c, support/ramdisk_support.c:
	Explicitly include "pmacros.h".
	* support/fstest.h: Don't include "pmacros.h".

11 files changed, 20 insertions, 2 deletions

diff --git a/testsuites/fstests/ChangeLog b/testsuites/fstests/ChangeLog
index 40ce4284b0..bcc8dd15b3 100644
--- a/testsuites/fstests/ChangeLog
+++ b/testsuites/fstests/ChangeLog
@@ -1,3 +1,11 @@
+2011-09-30	Ralf Corsépius <ralf.corsepius@rtems.org>
+
+	* fserror/test.c, fslink/test.c, fspatheval/test.c,
+	fspermission/test.c, fsrdwr/init.c, fssymlink/test.c,
+	fstime/test.c, support/fstest_support.c, support/ramdisk_support.c:
+	Explicitly include "pmacros.h".
+	* support/fstest.h: Don't include "pmacros.h".
+
 2011-09-07	Ralf Corsépius <ralf.corsepius@rtems.org>
 
 	* imfs_support/fs_supprot.h, support/fstest.h,
diff --git a/testsuites/fstests/fserror/test.c b/testsuites/fstests/fserror/test.c
index c262a37ad0..7c48024104 100644
--- a/testsuites/fstests/fserror/test.c
+++ b/testsuites/fstests/fserror/test.c
@@ -24,6 +24,7 @@
 #include <unistd.h>
 
 #include "fstest.h"
+#include "pmacros.h"
 
 void open_mkdir_error (void)
 {
diff --git a/testsuites/fstests/fslink/test.c b/testsuites/fstests/fslink/test.c
index fdc71b852c..fd30362f73 100644
--- a/testsuites/fstests/fslink/test.c
+++ b/testsuites/fstests/fslink/test.c
@@ -25,6 +25,7 @@
 #include <math.h>
 
 #include "fstest.h"
+#include "pmacros.h"
 
 /*
  * Test if the successful call works as expect
diff --git a/testsuites/fstests/fspatheval/test.c b/testsuites/fstests/fspatheval/test.c
index 0464fedd14..9ac61b390f 100644
--- a/testsuites/fstests/fspatheval/test.c
+++ b/testsuites/fstests/fspatheval/test.c
@@ -23,6 +23,7 @@
 #include <unistd.h>
 
 #include "fstest.h"
+#include "pmacros.h"
 
 #define BUF_SIZE 100
 
diff --git a/testsuites/fstests/fspermission/test.c b/testsuites/fstests/fspermission/test.c
index 4deabd52bd..74324243e4 100644
--- a/testsuites/fstests/fspermission/test.c
+++ b/testsuites/fstests/fspermission/test.c
@@ -25,6 +25,7 @@
 #include <unistd.h>
 
 #include "fstest.h"
+#include "pmacros.h"
 
 /*
  *  Test the umask
diff --git a/testsuites/fstests/fsrdwr/init.c b/testsuites/fstests/fsrdwr/init.c
index 5fb2d60648..f1aee06289 100644
--- a/testsuites/fstests/fsrdwr/init.c
+++ b/testsuites/fstests/fsrdwr/init.c
@@ -24,6 +24,7 @@
 #include <unistd.h>
 
 #include "fstest.h"
+#include "pmacros.h"
 
 const char *databuf =
   "Happy days are here again.  Happy days are here again.1Happy "
diff --git a/testsuites/fstests/fssymlink/test.c b/testsuites/fstests/fssymlink/test.c
index cb48aa86d5..84329e2b98 100644
--- a/testsuites/fstests/fssymlink/test.c
+++ b/testsuites/fstests/fssymlink/test.c
@@ -26,6 +26,7 @@
 #include <dirent.h>
 
 #include "fstest.h"
+#include "pmacros.h"
 
 /*
  * Test the function of symlink
diff --git a/testsuites/fstests/fstime/test.c b/testsuites/fstests/fstime/test.c
index f13e051a07..7f570b16ce 100644
--- a/testsuites/fstests/fstime/test.c
+++ b/testsuites/fstests/fstime/test.c
@@ -24,7 +24,9 @@
 #include <string.h>
 #include <unistd.h>
 #include <utime.h>
+
 #include "fstest.h"
+#include "pmacros.h"
 
 void time_test01 (void)
 {
diff --git a/testsuites/fstests/support/fstest.h b/testsuites/fstests/support/fstest.h
index 27402873b7..6342f75a21 100644
--- a/testsuites/fstests/support/fstest.h
+++ b/testsuites/fstests/support/fstest.h
@@ -12,8 +12,6 @@
 #ifndef __FSTEST_H
 #define __FSTEST_H
 
-#include "pmacros.h"
-
 #define TIME_PRECISION  (2)
 #define TIME_EQUAL(x,y) (abs((x)-(y))<TIME_PRECISION)
 
diff --git a/testsuites/fstests/support/fstest_support.c b/testsuites/fstests/support/fstest_support.c
index 2718915c56..5d8dd4c36a 100644
--- a/testsuites/fstests/support/fstest_support.c
+++ b/testsuites/fstests/support/fstest_support.c
@@ -18,6 +18,7 @@
 #include <fcntl.h>
 #include <string.h>
 #include <unistd.h>
+#include <stdlib.h> /* exit */
 #include <sys/stat.h>
 #include <sys/types.h>
 
@@ -27,6 +28,7 @@
 #include "fs_config.h"
 
 #include "fstest.h"
+#include "pmacros.h"
 
 #define TEMP_DIR "waterbuffalo"
 
diff --git a/testsuites/fstests/support/ramdisk_support.c b/testsuites/fstests/support/ramdisk_support.c
index 9a0d7556b7..02459ab939 100644
--- a/testsuites/fstests/support/ramdisk_support.c
+++ b/testsuites/fstests/support/ramdisk_support.c
@@ -19,6 +19,8 @@
 
 #include "ramdisk_support.h"
 #include "fstest.h"
+#include "pmacros.h"
+
 /*
  * Ramdisk information
  */