Moved the sockaddr_storage definition to lib/sockaddr.h and only include that
in files that actually need the struct.
This commit is contained in:
Родитель
6bcca3eca9
Коммит
37a6a0bb3e
|
@ -18,5 +18,6 @@ HHEADERS = arpa_telnet.h netrc.h file.h timeval.h base64.h hostip.h \
|
|||
share.h md5.h http_digest.h http_negotiate.h http_ntlm.h ca-bundle.h \
|
||||
inet_pton.h strtoofft.h strerror.h inet_ntop.h curlx.h memory.h \
|
||||
setup.h transfer.h select.h easyif.h multiif.h parsedate.h sslgen.h \
|
||||
gtls.h tftp.h
|
||||
gtls.h tftp.h sockaddr.h
|
||||
|
||||
|
||||
|
|
|
@ -94,6 +94,7 @@
|
|||
#include "inet_ntop.h"
|
||||
#include "select.h"
|
||||
#include "parsedate.h" /* for the week day and month names */
|
||||
#include "sockaddr.h" /* required for sockaddr_storage */
|
||||
|
||||
#if defined(HAVE_INET_NTOA_R) && !defined(HAVE_INET_NTOA_R_DECL)
|
||||
#include "inet_ntoa_r.h"
|
||||
|
|
|
@ -309,11 +309,4 @@ typedef int curl_socket_t;
|
|||
#define DEBUGF(x)
|
||||
#endif
|
||||
|
||||
#ifndef HAVE_STRUCT_SOCKADDR_STORAGE
|
||||
struct sockaddr_storage
|
||||
{
|
||||
char buffer[256]; /* this should be big enough to fit a lot */
|
||||
};
|
||||
#endif
|
||||
|
||||
#endif /* __SETUP_H */
|
||||
|
|
|
@ -0,0 +1,36 @@
|
|||
#ifndef __SOCKADDR_H
|
||||
#define __SOCKADDR_H
|
||||
/***************************************************************************
|
||||
* _ _ ____ _
|
||||
* Project ___| | | | _ \| |
|
||||
* / __| | | | |_) | |
|
||||
* | (__| |_| | _ <| |___
|
||||
* \___|\___/|_| \_\_____|
|
||||
*
|
||||
* Copyright (C) 1998 - 2005, Daniel Stenberg, <daniel@haxx.se>, et al.
|
||||
*
|
||||
* This software is licensed as described in the file COPYING, which
|
||||
* you should have received as part of this distribution. The terms
|
||||
* are also available at http://curl.haxx.se/docs/copyright.html.
|
||||
*
|
||||
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
|
||||
* copies of the Software, and permit persons to whom the Software is
|
||||
* furnished to do so, under the terms of the COPYING file.
|
||||
*
|
||||
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
||||
* KIND, either express or implied.
|
||||
*
|
||||
* $Id$
|
||||
***************************************************************************/
|
||||
|
||||
#include "setup.h"
|
||||
|
||||
#ifndef HAVE_STRUCT_SOCKADDR_STORAGE
|
||||
struct sockaddr_storage
|
||||
{
|
||||
char buffer[256]; /* this should be big enough to fit a lot */
|
||||
};
|
||||
#endif
|
||||
|
||||
|
||||
#endif /* __SOCKADDR_H */
|
|
@ -75,6 +75,7 @@
|
|||
#include "progress.h"
|
||||
#include "connect.h"
|
||||
#include "strerror.h"
|
||||
#include "sockaddr.h" /* required for sockaddr_storage */
|
||||
|
||||
#define _MPRINTF_REPLACE /* use our functions only */
|
||||
#include <curl/mprintf.h>
|
||||
|
|
Загрузка…
Ссылка в новой задаче