diff options
author | Marcoen Hirschberg <marcoen@gmail.com> | 2006-03-02 13:07:11 +0000 |
---|---|---|
committer | Marcoen Hirschberg <marcoen@gmail.com> | 2006-03-02 13:07:11 +0000 |
commit | f2fe4e0c4cd4ce3fe4d35c7422ada24c0ce3af9f (patch) | |
tree | ca029687656469b5804c0e733b7db198832ff3ab | |
parent | ccd0e7451dddcf5b3480364fa48ffc296a87e61d (diff) | |
download | rockbox-f2fe4e0c4cd4ce3fe4d35c7422ada24c0ce3af9f.tar.gz rockbox-f2fe4e0c4cd4ce3fe4d35c7422ada24c0ce3af9f.zip |
improve FreeBSD support a little
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8884 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | firmware/include/sys/types.h | 9 | ||||
-rw-r--r-- | firmware/include/time.h | 3 | ||||
-rwxr-xr-x | tools/configure | 2 |
3 files changed, 8 insertions, 6 deletions
diff --git a/firmware/include/sys/types.h b/firmware/include/sys/types.h index 7bca33b78d..e96f651ed0 100644 --- a/firmware/include/sys/types.h +++ b/firmware/include/sys/types.h | |||
@@ -20,29 +20,30 @@ | |||
20 | #ifndef _SYS_TYPES_H_ | 20 | #ifndef _SYS_TYPES_H_ |
21 | #define _SYS_TYPES_H_ | 21 | #define _SYS_TYPES_H_ |
22 | 22 | ||
23 | #if !defined(__ssize_t_defined) && !defined(_SSIZE_T_) && !defined(ssize_t) | 23 | #if !defined(__ssize_t_defined) && !defined(_SSIZE_T_) && !defined(ssize_t) && !defined(_SSIZE_T_DECLARED) |
24 | #define __ssize_t_defined | 24 | #define __ssize_t_defined |
25 | #define _SSIZE_T_ | 25 | #define _SSIZE_T_ |
26 | #define ssize_t ssize_t | 26 | #define ssize_t ssize_t |
27 | typedef signed long ssize_t; | 27 | typedef signed long ssize_t; |
28 | #endif | 28 | #endif |
29 | 29 | ||
30 | #if !defined(__off_t_defined) && !defined(_OFF_T_) && !defined(off_t) | 30 | #if !defined(__off_t_defined) && !defined(_OFF_T_) && !defined(off_t) && !defined(_OFF_T_DECLARED) |
31 | #define __off_t_defined | 31 | #define __off_t_defined |
32 | #define _OFF_T_ | 32 | #define _OFF_T_ |
33 | #define off_t off_t | 33 | #define off_t off_t |
34 | typedef signed long off_t; | 34 | typedef signed long off_t; |
35 | #endif | 35 | #endif |
36 | 36 | ||
37 | #if !defined(__mode_t_defined) && !defined(_MODE_T_) && !defined(mode_t) | 37 | #if !defined(__mode_t_defined) && !defined(_MODE_T_) && !defined(mode_t) && !defined(_MODE_T_DECLARED) |
38 | #define __mode_t_defined | 38 | #define __mode_t_defined |
39 | #define _MODE_T_ | 39 | #define _MODE_T_ |
40 | #define mode_t mode_t | 40 | #define mode_t mode_t |
41 | typedef unsigned int mode_t; | 41 | typedef unsigned int mode_t; |
42 | #endif | 42 | #endif |
43 | 43 | ||
44 | #ifndef _SIZE_T | 44 | #if !defined(_SIZE_T) && !defined(_SIZE_T_DECLARED) |
45 | #define _SIZE_T | 45 | #define _SIZE_T |
46 | #define _SIZE_T_DECLARED | ||
46 | typedef unsigned long size_t; | 47 | typedef unsigned long size_t; |
47 | #endif | 48 | #endif |
48 | 49 | ||
diff --git a/firmware/include/time.h b/firmware/include/time.h index 734344f810..cddec1e708 100644 --- a/firmware/include/time.h +++ b/firmware/include/time.h | |||
@@ -20,13 +20,14 @@ struct tm | |||
20 | int tm_isdst; | 20 | int tm_isdst; |
21 | }; | 21 | }; |
22 | 22 | ||
23 | #if defined(SIMULATOR) && !defined(_TIME_T_DEFINED) | 23 | #if defined(SIMULATOR) && !defined(_TIME_T_DEFINED) && !defined(_TIME_T_DECLARED) |
24 | /* for non-win32 simulators */ | 24 | /* for non-win32 simulators */ |
25 | typedef long time_t; | 25 | typedef long time_t; |
26 | 26 | ||
27 | /* this define below is used by the mingw headers to prevent duplicate | 27 | /* this define below is used by the mingw headers to prevent duplicate |
28 | typedefs */ | 28 | typedefs */ |
29 | #define _TIME_T_DEFINED | 29 | #define _TIME_T_DEFINED |
30 | #define _TIME_T_DECLARED | ||
30 | time_t time(time_t *t); | 31 | time_t time(time_t *t); |
31 | struct tm *localtime(const time_t *timep); | 32 | struct tm *localtime(const time_t *timep); |
32 | 33 | ||
diff --git a/tools/configure b/tools/configure index d008308a88..dd84525eb4 100755 --- a/tools/configure +++ b/tools/configure | |||
@@ -1235,7 +1235,7 @@ if [ "yes" = "$simulator" ]; then | |||
1235 | 1235 | ||
1236 | install: | 1236 | install: |
1237 | @echo "installing a full setup in your archos dir" | 1237 | @echo "installing a full setup in your archos dir" |
1238 | @(make zip && cd archos && unzip -oq ../rockbox.zip) | 1238 | @(\$(MAKE) zip && cd archos && unzip -oq ../rockbox.zip) |
1239 | EOF | 1239 | EOF |
1240 | 1240 | ||
1241 | fi | 1241 | fi |