Skip to content

Commit 9d8c006

Browse files
Modified one last area where int was used as socket type instead of MHD_socket, this time being in the API. MHD_socket is int on unix systems, so this change shouldn't break any existing code
1 parent a3fb0ec commit 9d8c006

File tree

4 files changed

+8
-4
lines changed

4 files changed

+8
-4
lines changed

README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,10 @@ Requirements
135135
* libmicrohttpd >= 0.9.7
136136
* doxygen (if you want to build code reference)
137137

138+
Additionally, for MinGW on windows you will need:
139+
* libwinpthread (For MinGW-w64, if you use thread model posix then you have this)
140+
* libgnurx >= 2.5.1
141+
138142
Compilation
139143
===========
140144
libhttpserver uses the standard system where the usual build process

src/httpserver/details/event_tuple.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ namespace details
4242
fd_set*,
4343
fd_set*,
4444
fd_set*,
45-
int*
45+
MHD_socket*
4646
);
4747

4848
typedef struct timeval(*get_timeout_ptr)();

src/httpserver/event_supplier.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ class event_supplier
4343
fd_set* read_fdset,
4444
fd_set* write_fdset,
4545
fd_set* exc_fdset,
46-
int* max
46+
MHD_socket* max
4747
) const
4848
{
4949
static_cast<CHILD*>(this)->supply_events(

src/webserver.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -308,10 +308,10 @@ void* webserver::select(void* self)
308308
++it
309309
)
310310
{
311-
int local_max;
311+
MHD_socket local_max;
312312
(*it).second.supply_events(&rs, &ws, &es, &local_max);
313313

314-
if((MHD_socket) local_max > max)
314+
if(local_max > max)
315315
max = local_max;
316316

317317
struct timeval t = (*it).second.get_timeout();

0 commit comments

Comments
 (0)