@@ -36,7 +36,7 @@
#include "rt-utils.h"
#include "rt-numa.h"
-#include "error.h"
+#include "rt-error.h"
#include <bionic.h>
@@ -14,8 +14,9 @@
#include <sys/wait.h>
#include <signal.h>
#include <sched.h>
-#include <rt-utils.h>
-#include "error.h"
+
+#include "rt-utils.h"
+#include "rt-error.h"
void low(pid_t pid); /* low priority process */
void medium(void); /* medium priority process */
similarity index 100%
rename from src/include/error.h
rename to src/include/rt-error.h
@@ -5,7 +5,7 @@
* error routines, similar to those found in
* Advanced Programming in the UNIX Environment 2nd ed.
*/
-#include "error.h"
+#include "rt-error.h"
/* Print an error message, plus a message for err and exit with error err */
void err_exit(int err, char *fmt, ...)
@@ -10,7 +10,7 @@
#include <sched.h>
#include <pthread.h>
-#include "error.h"
+#include "rt-error.h"
#include "rt-numa.h"
int get_available_cpus(struct bitmask *cpumask)
@@ -20,9 +20,10 @@
#include <sys/stat.h>
#include <unistd.h>
#include <sys/syscall.h> /* For SYS_gettid definitions */
+
#include "rt-utils.h"
#include "rt-sched.h"
-#include "error.h"
+#include "rt-error.h"
#define TRACEBUFSIZ 1024
@@ -43,7 +43,7 @@
#include "rt-utils.h"
#include "rt-numa.h"
-#include "error.h"
+#include "rt-error.h"
#ifdef __GNUC__
# define atomic_inc(ptr) __sync_add_and_fetch((ptr), 1)
@@ -47,8 +47,7 @@
#include "rt-sched.h"
#include "rt-utils.h"
-
-#include "error.h"
+#include "rt-error.h"
/* test timeout */
#define TIMEOUT 2
@@ -21,11 +21,11 @@
#include <linux/unistd.h>
#include <utmpx.h>
#include <mqueue.h>
+#include <pthread.h>
+
#include "rt-utils.h"
#include "rt-get_cpu.h"
-#include "error.h"
-
-#include <pthread.h>
+#include "rt-error.h"
#define SYNCMQ_NAME "/syncmsg%d"
#define TESTMQ_NAME "/testmsg%d"
@@ -19,11 +19,11 @@
#include <sys/mman.h>
#include <linux/unistd.h>
#include <utmpx.h>
+#include <pthread.h>
+
#include "rt-utils.h"
#include "rt-get_cpu.h"
-#include "error.h"
-
-#include <pthread.h>
+#include "rt-error.h"
enum {
AFFINITY_UNSPECIFIED,
@@ -31,7 +31,7 @@
#include <sys/time.h>
#include <sys/mman.h>
-#include "error.h"
+#include "rt-error.h"
#include "rt-utils.h"
#include "rt-numa.h"
@@ -42,7 +42,7 @@
#include "rt-utils.h"
#include "rt-get_cpu.h"
-#include "error.h"
+#include "rt-error.h"
enum {
AFFINITY_UNSPECIFIED,
@@ -28,9 +28,10 @@
#include <sys/sem.h>
#include <sys/time.h>
#include <sys/mman.h>
+
#include "rt-utils.h"
#include "rt-get_cpu.h"
-#include "error.h"
+#include "rt-error.h"
#define SEM_WAIT_FOR_RECEIVER 0
#define SEM_WAIT_FOR_SENDER 1
Avoid confusion with the system header called error.h. Signed-off-by: Daniel Wagner <dwagner@suse.de> --- src/cyclictest/cyclictest.c | 2 +- src/include/pip_stress.h | 5 +++-- src/include/{error.h => rt-error.h} | 0 src/lib/error.c | 2 +- src/lib/rt-numa.c | 2 +- src/lib/rt-utils.c | 3 ++- src/oslat/oslat.c | 2 +- src/pi_tests/pi_stress.c | 3 +-- src/pmqtest/pmqtest.c | 6 +++--- src/ptsematest/ptsematest.c | 6 +++--- src/signaltest/signaltest.c | 2 +- src/sigwaittest/sigwaittest.c | 2 +- src/svsematest/svsematest.c | 3 ++- 13 files changed, 20 insertions(+), 18 deletions(-) rename src/include/{error.h => rt-error.h} (100%)