Commit 37a6a0bb authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

Moved the sockaddr_storage definition to lib/sockaddr.h and only include that 

in files that actually need the struct.
parent 6bcca3ec

lib/Makefile.inc

+2 −1
Original line number Diff line number Diff line
@@ -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

lib/ftp.c

+1 −0
Original line number Diff line number Diff line
@@ -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"

lib/setup.h

+0 −7
Original line number Diff line number Diff line
@@ -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 */

lib/sockaddr.h

0 → 100644
+36 −0
Original line number Diff line number Diff line 
#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 */

lib/tftp.c

+1 −0
Original line number Diff line number Diff line
@@ -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>