mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-29 09:04:17 +00:00
c4486a084f
Fixes build errors for the third-party mongoose module:
```
In file included from
/nix/store/r5s3w32ahjzdlzsfrhybc3l2qcpi6yb2-libpcap-1.9.0/include/pcap.h:43,
from /build/ntopng-2.0/include/ntop_includes.h:93,
from src/HTTPserver.cpp:22:
/nix/store/r5s3w32ahjzdlzsfrhybc3l2qcpi6yb2-libpcap-1.9.0/include/pcap/pcap.h:958: note: this is the location of the previous definition
#define INVALID_SOCKET -1
src/../third-party/mongoose/mongoose.c:270:13: error: multiple types in one declaration
typedef int SOCKET;
^~~~~~
```
35 lines
952 B
Diff
35 lines
952 B
Diff
From 9cb650ea96c0e5063775071cfdae072e92c553b8 Mon Sep 17 00:00:00 2001
|
|
From: emanuele-f <faranda@ntop.org>
|
|
Date: Tue, 18 Sep 2018 12:49:57 +0200
|
|
Subject: [PATCH] Compilation fix with new libpcap
|
|
|
|
SOCKET and INVALID_SOCKET are now defined in pcap.h
|
|
---
|
|
third-party/mongoose/mongoose.c | 4 ++++
|
|
1 file changed, 4 insertions(+)
|
|
|
|
diff --git a/third-party/mongoose/mongoose.c b/third-party/mongoose/mongoose.c
|
|
index 6a61cea9b..634c142e3 100644
|
|
--- a/third-party/mongoose/mongoose.c
|
|
+++ b/third-party/mongoose/mongoose.c
|
|
@@ -247,7 +247,9 @@ struct pollfd {
|
|
#define mg_rename(x, y) rename(x, y)
|
|
#define mg_sleep(x) usleep((x) * 1000)
|
|
#define ERRNO errno
|
|
+#ifndef INVALID_SOCKET
|
|
#define INVALID_SOCKET (-1)
|
|
+#endif
|
|
|
|
/* ntop */
|
|
#if ((ULONG_MAX) == (UINT_MAX))
|
|
@@ -270,7 +272,9 @@ struct pollfd {
|
|
#endif
|
|
|
|
//#define INT64_FMT PRId64
|
|
+#ifndef SOCKET
|
|
typedef int SOCKET;
|
|
+#endif
|
|
#define WINCDECL
|
|
|
|
#endif // End of Windows and UNIX specific includes
|