Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2015-01-25 19:16:43 (GMT) |
|---|---|---|
| committer | Swift Review <review@swift.im> | 2015-02-09 15:46:21 (GMT) |
| commit | 415e2a0e26af19e00b7cafb58be72909ae1d8212 (patch) | |
| tree | 945996fd950a3800e17a7897efb45d915b2537fc /3rdParty/LibMiniUPnPc/src/miniupnpc/receivedata.h | |
| parent | 1c64e31945e80e927f87a0a94ec5ce0e00c40a7f (diff) | |
| download | swift-415e2a0e26af19e00b7cafb58be72909ae1d8212.zip swift-415e2a0e26af19e00b7cafb58be72909ae1d8212.tar.bz2 | |
Update libminiupnpc to version 1.9
Fixes to our build of libminiupnpc:
* do not build minissdpc.c on windows
* if size of ip_mreqn is not defined, add -DNEED_STRUCT_IP_MREQN to the
CFLAGS
Test-Information:
Verified it still builds.
Change-Id: Idd3e19d6302cccc95fff0a01540b9abc1bc91e9e
Diffstat (limited to '3rdParty/LibMiniUPnPc/src/miniupnpc/receivedata.h')
| -rw-r--r-- | 3rdParty/LibMiniUPnPc/src/miniupnpc/receivedata.h | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/3rdParty/LibMiniUPnPc/src/miniupnpc/receivedata.h b/3rdParty/LibMiniUPnPc/src/miniupnpc/receivedata.h index 7a551b9..0520a11 100644 --- a/3rdParty/LibMiniUPnPc/src/miniupnpc/receivedata.h +++ b/3rdParty/LibMiniUPnPc/src/miniupnpc/receivedata.h @@ -1,17 +1,19 @@ -/* $Id: receivedata.h,v 1.1 2011/04/11 08:21:47 nanard Exp $ */ +/* $Id: receivedata.h,v 1.4 2012/09/27 15:42:10 nanard Exp $ */ /* Project: miniupnp * http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/ * Author: Thomas Bernard - * Copyright (c) 2011 Thomas Bernard + * Copyright (c) 2011-2012 Thomas Bernard * This software is subjects to the conditions detailed * in the LICENCE file provided within this distribution */ -#ifndef __RECEIVEDATA_H__ -#define __RECEIVEDATA_H__ +#ifndef RECEIVEDATA_H_INCLUDED +#define RECEIVEDATA_H_INCLUDED -/* Reads data from the specified socket. - * Returns the number of bytes read if successful, zero if no bytes were +/* Reads data from the specified socket. + * Returns the number of bytes read if successful, zero if no bytes were * read or if we timed out. Returns negative if there was an error. */ -int receivedata(int socket, char * data, int length, int timeout); +int receivedata(int socket, + char * data, int length, + int timeout, unsigned int * scope_id); #endif |