summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2009-07-02 15:03:59 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2009-07-02 15:04:15 (GMT)
commit8b8e6a7e12e7f5769b60d827f7c8443aa71c339a (patch)
treebbf7d5f49829fb338758842bdb120c40d198b26a
parent8dbdcc129a7bb5f924aeb451799bc4d7495714ba (diff)
downloadQt-8b8e6a7e12e7f5769b60d827f7c8443aa71c339a.zip
Qt-8b8e6a7e12e7f5769b60d827f7c8443aa71c339a.tar.gz
Qt-8b8e6a7e12e7f5769b60d827f7c8443aa71c339a.tar.bz2
Use void* in the read/write replacements
That's what unistd.h uses: void* can receive any pointer, while char* can't
-rw-r--r--src/corelib/kernel/qcore_unix_p.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/kernel/qcore_unix_p.h b/src/corelib/kernel/qcore_unix_p.h
index 6ae4ff0..1f3fe39 100644
--- a/src/corelib/kernel/qcore_unix_p.h
+++ b/src/corelib/kernel/qcore_unix_p.h
@@ -193,7 +193,7 @@ static inline int qt_safe_dup2(int oldfd, int newfd, int flags = FD_CLOEXEC)
return 0;
}
-static inline qint64 qt_safe_read(int fd, char *data, qint64 maxlen)
+static inline qint64 qt_safe_read(int fd, void *data, qint64 maxlen)
{
qint64 ret = 0;
EINTR_LOOP(ret, QT_READ(fd, data, maxlen));
@@ -202,7 +202,7 @@ static inline qint64 qt_safe_read(int fd, char *data, qint64 maxlen)
#undef QT_READ
#define QT_READ qt_safe_read
-static inline qint64 qt_safe_write(int fd, const char *data, qint64 len)
+static inline qint64 qt_safe_write(int fd, const void *data, qint64 len)
{
qint64 ret = 0;
EINTR_LOOP(ret, QT_WRITE(fd, data, len));