From 5d987d61cf5ecb99efe25d8547b7631dfe96d7de Mon Sep 17 00:00:00 2001 From: Frank Gevaerts Date: Fri, 14 May 2010 22:01:07 +0000 Subject: Move include/sys along with libc/, so hosted (sim/RaaA) builds use the proper files for their OS git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26030 a1c6a512-1295-4272-9138-f99709370657 --- firmware/include/sys/timeb.h | 38 ------------------------- firmware/include/sys/types.h | 58 --------------------------------------- firmware/libc/include/sys/timeb.h | 38 +++++++++++++++++++++++++ firmware/libc/include/sys/types.h | 58 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 96 insertions(+), 96 deletions(-) delete mode 100644 firmware/include/sys/timeb.h delete mode 100644 firmware/include/sys/types.h create mode 100644 firmware/libc/include/sys/timeb.h create mode 100644 firmware/libc/include/sys/types.h diff --git a/firmware/include/sys/timeb.h b/firmware/include/sys/timeb.h deleted file mode 100644 index 4e97ec8..0000000 --- a/firmware/include/sys/timeb.h +++ /dev/null @@ -1,38 +0,0 @@ -/* timeb.h -- An implementation of the standard Unix file. - Written by Ian Lance Taylor - Public domain; no rights reserved. - - declares the structure used by the ftime function, as - well as the ftime function itself. Newlib does not provide an - implementation of ftime. */ - -#ifndef _SYS_TIMEB_H - -#ifdef __cplusplus -extern "C" { -#endif - -#define _SYS_TIMEB_H - -#include <_ansi.h> - -#ifndef __time_t_defined -typedef _TIME_T_ time_t; -#define __time_t_defined -#endif - -struct timeb -{ - time_t time; - unsigned short millitm; - short timezone; - short dstflag; -}; - -extern int ftime _PARAMS ((struct timeb *)); - -#ifdef __cplusplus -} -#endif - -#endif /* ! defined (_SYS_TIMEB_H) */ diff --git a/firmware/include/sys/types.h b/firmware/include/sys/types.h deleted file mode 100644 index ecc25fd..0000000 --- a/firmware/include/sys/types.h +++ /dev/null @@ -1,58 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2010 Thomas Martitz - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ - -/** - * provide a sys/types.h for compatibility with imported code - **/ - -#ifndef __TYPES_H__ -#define __TYPES_H__ - - -/* - * include string.h for size_t for convinence */ -#include -/* make some (debian, ubuntu...) systems happy that inappropriately include - * sys/types.h to get intN_t ... */ -#include - -#if !defined(__ssize_t_defined) && !defined(_SSIZE_T_) && !defined(ssize_t) && !defined(_SSIZE_T_DECLARED) -#define __ssize_t_defined -#define _SSIZE_T_ -#define ssize_t ssize_t -typedef signed long ssize_t; -#endif - -#if !defined(__off_t_defined) && !defined(_OFF_T_) && !defined(off_t) && !defined(_OFF_T_DECLARED) -#define __off_t_defined -#define _OFF_T_ -#define off_t off_t -typedef signed long off_t; -#endif - -#if !defined(__mode_t_defined) && !defined(_MODE_T_) && !defined(mode_t) && !defined(_MODE_T_DECLARED) -#define __mode_t_defined -#define _MODE_T_ -#define mode_t mode_t -typedef unsigned int mode_t; -#endif - -#endif /* __TYPES_H__ */ diff --git a/firmware/libc/include/sys/timeb.h b/firmware/libc/include/sys/timeb.h new file mode 100644 index 0000000..4e97ec8 --- /dev/null +++ b/firmware/libc/include/sys/timeb.h @@ -0,0 +1,38 @@ +/* timeb.h -- An implementation of the standard Unix file. + Written by Ian Lance Taylor + Public domain; no rights reserved. + + declares the structure used by the ftime function, as + well as the ftime function itself. Newlib does not provide an + implementation of ftime. */ + +#ifndef _SYS_TIMEB_H + +#ifdef __cplusplus +extern "C" { +#endif + +#define _SYS_TIMEB_H + +#include <_ansi.h> + +#ifndef __time_t_defined +typedef _TIME_T_ time_t; +#define __time_t_defined +#endif + +struct timeb +{ + time_t time; + unsigned short millitm; + short timezone; + short dstflag; +}; + +extern int ftime _PARAMS ((struct timeb *)); + +#ifdef __cplusplus +} +#endif + +#endif /* ! defined (_SYS_TIMEB_H) */ diff --git a/firmware/libc/include/sys/types.h b/firmware/libc/include/sys/types.h new file mode 100644 index 0000000..ecc25fd --- /dev/null +++ b/firmware/libc/include/sys/types.h @@ -0,0 +1,58 @@ +/*************************************************************************** + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * $Id$ + * + * Copyright (C) 2010 Thomas Martitz + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ****************************************************************************/ + +/** + * provide a sys/types.h for compatibility with imported code + **/ + +#ifndef __TYPES_H__ +#define __TYPES_H__ + + +/* + * include string.h for size_t for convinence */ +#include +/* make some (debian, ubuntu...) systems happy that inappropriately include + * sys/types.h to get intN_t ... */ +#include + +#if !defined(__ssize_t_defined) && !defined(_SSIZE_T_) && !defined(ssize_t) && !defined(_SSIZE_T_DECLARED) +#define __ssize_t_defined +#define _SSIZE_T_ +#define ssize_t ssize_t +typedef signed long ssize_t; +#endif + +#if !defined(__off_t_defined) && !defined(_OFF_T_) && !defined(off_t) && !defined(_OFF_T_DECLARED) +#define __off_t_defined +#define _OFF_T_ +#define off_t off_t +typedef signed long off_t; +#endif + +#if !defined(__mode_t_defined) && !defined(_MODE_T_) && !defined(mode_t) && !defined(_MODE_T_DECLARED) +#define __mode_t_defined +#define _MODE_T_ +#define mode_t mode_t +typedef unsigned int mode_t; +#endif + +#endif /* __TYPES_H__ */ -- cgit v1.1