[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnurl] 108/208: select.h: avoid macro redefinition harder
From: |
gnunet |
Subject: |
[GNUnet-SVN] [gnurl] 108/208: select.h: avoid macro redefinition harder |
Date: |
Wed, 09 Aug 2017 17:35:05 +0200 |
This is an automated email from the git hooks/post-receive script.
ng0 pushed a commit to annotated tag gnurl-7.55.0
in repository gnurl.
commit 7e21e5fd0c709d79ab27c65fd0afff4cf34e0da9
Author: Daniel Stenberg <address@hidden>
AuthorDate: Wed Jul 5 12:32:09 2017 +0200
select.h: avoid macro redefinition harder
... by checking the POLLIN define, as the header file checks don't work
on Windows.
---
lib/select.h | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/lib/select.h b/lib/select.h
index 4ed5dd2f8..4351786c3 100644
--- a/lib/select.h
+++ b/lib/select.h
@@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2016, Daniel Stenberg, <address@hidden>, et al.
+ * Copyright (C) 1998 - 2017, Daniel Stenberg, <address@hidden>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -36,7 +36,8 @@
#if !defined(HAVE_STRUCT_POLLFD) && \
!defined(HAVE_SYS_POLL_H) && \
- !defined(HAVE_POLL_H)
+ !defined(HAVE_POLL_H) && \
+ !defined(POLLIN)
#define POLLIN 0x01
#define POLLPRI 0x02
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [gnurl] 52/208: if2ip: fix compiler warning in ISO C90 mode, (continued)
- [GNUnet-SVN] [gnurl] 52/208: if2ip: fix compiler warning in ISO C90 mode, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 76/208: curl --socks5-{basic, gssapi}: control socks5 auth, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 82/208: http2: handle PING frames, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 57/208: lib1521: fix missing-variable-declarations clang warnings, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 88/208: cmake: Added compatibility options for older Windows versions, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 100/208: smb: fix build for djgpp/MSDOS, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 105/208: TODO: HTTP proxy CONNECT is non-blocking now, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 91/208: url: make the original string get used on subsequent transfers, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 119/208: travis: do more tests in the coverage run, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 122/208: cmake: offer CMAKE_DEBUG_POSTFIX when building with MSVC, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 108/208: select.h: avoid macro redefinition harder,
gnunet <=
- [GNUnet-SVN] [gnurl] 128/208: tool_cb_wrt: fix variable shadowing warning, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 127/208: RELEASE-NOTES: synced with be2c999b8, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 109/208: cmake: if inet_pton is used, bump _WIN32_WINNT, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 25/208: tests: stabilize test 2032 and 2033, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 141/208: system.h: include winsock2.h before windows.h, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 46/208: mkhelp.pl: fix script name in usage text, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 124/208: travis: detect and use valgrind for normal builds, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 140/208: build: remove WIN32_LEAN_AND_MEAN from individual build systems, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 118/208: curl_easy_escape.3: mention the (lack of) encoding, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 134/208: make: fix docs build on OpenBSD, gnunet, 2017/08/09