From 5298406d2046659ee7123542fdaf2686b709455f Mon Sep 17 00:00:00 2001 From: verhaegs Date: Sun, 20 Mar 2011 16:15:51 +0000 Subject: [PATCH] Renamed include file aros/_timeval.h to aros/types/timeval_s.h. git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@37689 fb15a70f-31f2-0310-bbcc-cdcc74a49acc --- arch/all-android/devs/filesys/emul_handler/emul_dir.c | 2 +- arch/all-unix/devs/filesys/emul_handler/emul_dir.c | 2 +- arch/all-unix/devs/filesys/emul_handler/emul_host.c | 2 +- compiler/clib/include/sys/time.h | 2 +- compiler/include/aros/{_timeval.h => types/timeval_s.h} | 6 +++--- compiler/include/devices/timer.h | 4 ++-- compiler/include/mmakefile | 1 + 7 files changed, 10 insertions(+), 9 deletions(-) rename compiler/include/aros/{_timeval.h => types/timeval_s.h} (87%) diff --git a/arch/all-android/devs/filesys/emul_handler/emul_dir.c b/arch/all-android/devs/filesys/emul_handler/emul_dir.c index e7532f004a..b3b79b57ef 100644 --- a/arch/all-android/devs/filesys/emul_handler/emul_dir.c +++ b/arch/all-android/devs/filesys/emul_handler/emul_dir.c @@ -3,7 +3,7 @@ #include /* This prevents redefinition of struct timeval */ -#define _AROS_TIMEVAL_H_ +#define _AROS_TYPES_TIMEVAL_S_H_ #include diff --git a/arch/all-unix/devs/filesys/emul_handler/emul_dir.c b/arch/all-unix/devs/filesys/emul_handler/emul_dir.c index d468da184c..f5ab504efc 100644 --- a/arch/all-unix/devs/filesys/emul_handler/emul_dir.c +++ b/arch/all-unix/devs/filesys/emul_handler/emul_dir.c @@ -10,7 +10,7 @@ #include /* This prevents redefinition of struct timeval */ -#define _AROS_TIMEVAL_H_ +#define _AROS_TYPES_TIMEVAL_S_H_ #include diff --git a/arch/all-unix/devs/filesys/emul_handler/emul_host.c b/arch/all-unix/devs/filesys/emul_handler/emul_host.c index 89963ec6c9..22cbbb34bf 100644 --- a/arch/all-unix/devs/filesys/emul_handler/emul_host.c +++ b/arch/all-unix/devs/filesys/emul_handler/emul_host.c @@ -46,7 +46,7 @@ #pragma pack() /* This prevents redefinition of struct timeval */ -#define _AROS_TIMEVAL_H_ +#define _AROS_TYPES_TIMEVAL_S_H_ #define DEBUG 0 #define DASYNC(x) diff --git a/compiler/clib/include/sys/time.h b/compiler/clib/include/sys/time.h index f64eb6800c..347d402f64 100644 --- a/compiler/clib/include/sys/time.h +++ b/compiler/clib/include/sys/time.h @@ -12,7 +12,7 @@ #include #include /* XXX Probably not allowed */ -#include /* get struct timeval */ +#include /* get struct timeval */ /* struct itimerval is used by the interval timers getitimer()/setitimer() */ struct itimerval diff --git a/compiler/include/aros/_timeval.h b/compiler/include/aros/types/timeval_s.h similarity index 87% rename from compiler/include/aros/_timeval.h rename to compiler/include/aros/types/timeval_s.h index 5dc8c0e80f..b3034f0113 100644 --- a/compiler/include/aros/_timeval.h +++ b/compiler/include/aros/types/timeval_s.h @@ -1,5 +1,5 @@ -#ifndef _AROS_TIMEVAL_H_ -#define _AROS_TIMEVAL_H_ +#ifndef _AROS_TYPES_TIMEVAL_S_H_ +#define _AROS_TYPES_TIMEVAL_S_H_ #include @@ -23,4 +23,4 @@ __extension__ struct timeval }; }; -#endif /* ! _SYS__TIMEVAL_H_ */ +#endif /* ! _AROS_TYPES_TIMEVAL_S_H_ */ diff --git a/compiler/include/devices/timer.h b/compiler/include/devices/timer.h index cc9430be52..dc5895949a 100644 --- a/compiler/include/devices/timer.h +++ b/compiler/include/devices/timer.h @@ -2,7 +2,7 @@ #define DEVICES_TIMER_H /* - Copyright © 1995-2001, The AROS Development Team. All rights reserved. + Copyright © 1995-2011, The AROS Development Team. All rights reserved. $Id$ Desc: Timer device @@ -31,7 +31,7 @@ #define TR_GETSYSTIME (CMD_NONSTD+1) #define TR_SETSYSTIME (CMD_NONSTD+2) -#include /* get struct timeval */ +#include /* get struct timeval */ struct EClockVal { diff --git a/compiler/include/mmakefile b/compiler/include/mmakefile index cd727636e0..5239de9622 100644 --- a/compiler/include/mmakefile +++ b/compiler/include/mmakefile @@ -5,6 +5,7 @@ INCSUBDIRS := aros \ aros/preprocessor \ aros/preprocessor/facilities \ aros/preprocessor/variadic \ + aros/types \ bluetooth \ c++ \ c++/exec \ -- 2.11.4.GIT