summaryrefslogtreecommitdiff
path: root/firmware/include
diff options
context:
space:
mode:
authorThomas Martitz <kugel@rockbox.org>2010-05-06 21:49:09 +0000
committerThomas Martitz <kugel@rockbox.org>2010-05-06 21:49:09 +0000
commit3e400b2ae60a2f21b1892bf29758f8913059f381 (patch)
tree62d54e7bdc35fc707f7bc90ee92b2d94a0255fba /firmware/include
parent77dfff5a5524e0a9d3ae54d8bb61d3c01e6082bb (diff)
downloadrockbox-3e400b2ae60a2f21b1892bf29758f8913059f381.zip
rockbox-3e400b2ae60a2f21b1892bf29758f8913059f381.tar.gz
rockbox-3e400b2ae60a2f21b1892bf29758f8913059f381.tar.bz2
rockbox-3e400b2ae60a2f21b1892bf29758f8913059f381.tar.xz
Fix checkwps by using host system's file IO (thanks to r25843/r25844) and by including a work around for systems that try to get intN_t via sys/types.h (which should be wrong, but well).
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25854 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/include')
-rw-r--r--firmware/include/file.h10
-rw-r--r--firmware/include/sys/types.h3
2 files changed, 10 insertions, 3 deletions
diff --git a/firmware/include/file.h b/firmware/include/file.h
index 2d5c9b8..1a43c6a 100644
--- a/firmware/include/file.h
+++ b/firmware/include/file.h
@@ -22,12 +22,15 @@
#ifndef _FILE_H_
#define _FILE_H_
-#include <sys/types.h>
-#include "_ansi.h"
-
#undef MAX_PATH /* this avoids problems when building simulator */
#define MAX_PATH 260
+#ifdef __PCTOOL__
+#include <fcntl.h>
+#else
+#include <sys/types.h>
+#include "_ansi.h"
+
#define MAX_OPEN_FILES 11
#ifndef SEEK_SET
@@ -97,3 +100,4 @@ extern off_t filesize(int fd);
extern int release_files(int volume);
int fdprintf (int fd, const char *fmt, ...) ATTRIBUTE_PRINTF(2, 3);
#endif
+#endif
diff --git a/firmware/include/sys/types.h b/firmware/include/sys/types.h
index 07f9e9c..ecc25fd 100644
--- a/firmware/include/sys/types.h
+++ b/firmware/include/sys/types.h
@@ -30,6 +30,9 @@
/*
* include string.h for size_t for convinence */
#include <string.h>
+/* make some (debian, ubuntu...) systems happy that inappropriately include
+ * sys/types.h to get intN_t ... */
+#include <inttypes.h>
#if !defined(__ssize_t_defined) && !defined(_SSIZE_T_) && !defined(ssize_t) && !defined(_SSIZE_T_DECLARED)
#define __ssize_t_defined