]> git.pld-linux.org Git - packages/mongodb.git/blob - mongodb-pcap.patch
- added pcap patch (fix build errors caused by some libpcap #defines); release 10
[packages/mongodb.git] / mongodb-pcap.patch
1 #--- mongodb-src-r2.2.4/src/mongo/util/net/sock.h.orig  2013-04-01 04:41:49.000000000 +0200
2 #+++ mongodb-src-r2.2.4/src/mongo/util/net/sock.h       2019-04-28 20:26:20.537526400 +0200
3 #@@ -59,8 +59,6 @@
4 # #else // _WIN32
5
6 #     inline void closesocket(int s) { close(s); }
7 #-    const int INVALID_SOCKET = -1;
8 #-    typedef int SOCKET;
9
10 # #endif // _WIN32
11
12 #--- mongodb-src-r2.2.4/src/mongo/util/net/sock.cpp.orig        2013-04-01 04:41:49.000000000 +0200
13 #+++ mongodb-src-r2.2.4/src/mongo/util/net/sock.cpp     2019-04-28 20:26:36.338355487 +0200
14 #@@ -578,7 +578,7 @@
15 #         _remote = remote;
16
17 #         _fd = socket(remote.getType(), SOCK_STREAM, 0);
18 #-        if ( _fd == INVALID_SOCKET ) {
19 #+        if ( _fd == -1 ) {
20 #             LOG(_logLevel) << "ERROR: connect invalid socket " << errnoWithDescription() << endl;
21 #             return false;
22 #         }
23 --- mongodb-src-r2.2.4/src/mongo/util/net/sock.h.orig   2019-04-28 20:27:19.950643872 +0200
24 +++ mongodb-src-r2.2.4/src/mongo/util/net/sock.h        2019-04-28 20:36:33.543024811 +0200
25 @@ -39,6 +39,10 @@
26  #include <openssl/ssl.h>
27  #endif
28  
29 +// in case it's defined in some (e.g. pcap) headers
30 +#undef SOCKET
31 +#undef INVALID_SOCKET
32 +
33  namespace mongo {
34  
35      const int SOCK_FAMILY_UNKNOWN_ERROR=13078;
This page took 0.050148 seconds and 3 git commands to generate.