diff options
author | Bertrik Sikken <bertrik@sikken.nl> | 2008-04-28 16:18:04 +0000 |
---|---|---|
committer | Bertrik Sikken <bertrik@sikken.nl> | 2008-04-28 16:18:04 +0000 |
commit | 2843469876a543a1a5beaa27b9d4ae8ab0e201d0 (patch) | |
tree | 74a487c754d1bd63532b500f603492bec5bbcc2a /firmware | |
parent | 5b1e86c35fa7e03a841c1d58d869e925f7638904 (diff) |
Moved atoi declaration to stdlib.h. Deleted atoi.h
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17280 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/common/dir_uncached.c | 2 | ||||
-rw-r--r-- | firmware/common/dircache.c | 2 | ||||
-rw-r--r-- | firmware/drivers/fat.c | 1 | ||||
-rw-r--r-- | firmware/id3.c | 1 | ||||
-rw-r--r-- | firmware/include/atoi.h | 25 | ||||
-rw-r--r-- | firmware/include/stdlib.h | 2 |
6 files changed, 4 insertions, 29 deletions
diff --git a/firmware/common/dir_uncached.c b/firmware/common/dir_uncached.c index 129ef35603..105265bc8f 100644 --- a/firmware/common/dir_uncached.c +++ b/firmware/common/dir_uncached.c @@ -20,10 +20,10 @@ #include <errno.h> #include <string.h> #include <stdbool.h> +#include <stdlib.h> #include "fat.h" #include "dir.h" #include "debug.h" -#include "atoi.h" #define MAX_OPEN_DIRS 8 diff --git a/firmware/common/dircache.c b/firmware/common/dircache.c index d2a0b31600..40d86f3552 100644 --- a/firmware/common/dircache.c +++ b/firmware/common/dircache.c @@ -27,8 +27,8 @@ #include <errno.h> #include <string.h> #include <stdbool.h> +#include <stdlib.h> #include "debug.h" -#include "atoi.h" #include "system.h" #include "logf.h" #include "dircache.h" diff --git a/firmware/drivers/fat.c b/firmware/drivers/fat.c index 002e100405..0ff47a82b5 100644 --- a/firmware/drivers/fat.c +++ b/firmware/drivers/fat.c @@ -30,7 +30,6 @@ #include "kernel.h" #include "rbunicode.h" #include "logf.h" -#include "atoi.h" #define BYTES2INT16(array,pos) \ (array[pos] | (array[pos+1] << 8 )) diff --git a/firmware/id3.c b/firmware/id3.c index 181ce97c6c..0e5c05ca27 100644 --- a/firmware/id3.c +++ b/firmware/id3.c @@ -36,7 +36,6 @@ #include "config.h" #include "file.h" #include "logf.h" -#include "atoi.h" #include "id3.h" #include "mp3data.h" diff --git a/firmware/include/atoi.h b/firmware/include/atoi.h deleted file mode 100644 index 118879622b..0000000000 --- a/firmware/include/atoi.h +++ /dev/null @@ -1,25 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2002 by Felix Arends - * - * All files in this archive are subject to the GNU General Public License. - * See the file COPYING in the source tree root for full license agreement. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ - -#ifndef __ATOI_H__ -#define __ATOI_H__ - -int atoi (const char *str); - -#endif /* __ATOI_H__ */ diff --git a/firmware/include/stdlib.h b/firmware/include/stdlib.h index 1f4fb88668..504b59247a 100644 --- a/firmware/include/stdlib.h +++ b/firmware/include/stdlib.h @@ -41,6 +41,8 @@ int rand(void); #ifdef SIMULATOR void exit(int status); #endif + +int atoi (const char *str); #ifdef __cplusplus } |