OSDN Git Service
(root)
/
kde
/
Katie.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
93f72d0
)
do not undefine socket() and accept() from qnet_unix_p header
author
Ivailo Monev
<xakepa10@gmail.com>
Thu, 30 Sep 2021 21:58:39 +0000
(
00:58
+0300)
committer
Ivailo Monev
<xakepa10@gmail.com>
Thu, 30 Sep 2021 21:58:39 +0000
(
00:58
+0300)
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
src/network/socket/qnet_unix_p.h
patch
|
blob
|
history
diff --git
a/src/network/socket/qnet_unix_p.h
b/src/network/socket/qnet_unix_p.h
index
97ea232
..
614c917
100644
(file)
--- a/
src/network/socket/qnet_unix_p.h
+++ b/
src/network/socket/qnet_unix_p.h
@@
-79,14
+79,6
@@
static inline int qt_safe_connect(int sockfd, const struct sockaddr *addr, QT_SO
return ret;
}
-#if defined(socket)
-# undef socket
-#endif
-#if defined(accept)
-# undef accept
-#endif
-
-// VxWorks' headers do not specify any const modifiers
static inline int qt_safe_sendto(int sockfd, const void *buf, size_t len, int flags, const struct sockaddr *to, QT_SOCKLEN_T tolen)
{
#ifdef MSG_NOSIGNAL