Commit c49e9683 authored by Yang Tse's avatar Yang Tse
Browse files

build: libhostname linkage adjustments followup

parent 6ea043a5

tests/libtest/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ if NO_UNDEFINED 
UNDEF = -no-undefined

endif



libhostname_la_SOURCES = sethostname.c

libhostname_la_SOURCES = sethostname.c sethostname.h



libhostname_la_LIBADD =

libhostname_la_DEPENDENCIES =

tests/libtest/sethostname.c

+2 −2
Original line number Diff line number Diff line
@@ -9,12 +9,12 @@ 


#include "setup.h"



#include "sethostname.h"



/*

 * we force our own host name, in order to make some tests machine independent

 */



int gethostname(char *name, GETHOSTNAME_TYPE_ARG2 namelen);



int gethostname(char *name, GETHOSTNAME_TYPE_ARG2 namelen)

{

  const char *force_hostname = getenv("CURL_GETHOSTNAME");

tests/libtest/sethostname.h

0 → 100644
+25 −0
Original line number Diff line number Diff line 
/*****************************************************************************

 *                                  _   _ ____  _

 *  Project                     ___| | | |  _ \| |

 *                             / __| | | | |_) | |

 *                            | (__| |_| |  _ <| |___

 *                             \___|\___/|_| \_\_____|

 *

 */



#if (defined(WIN32) || defined(__SYMBIAN32__)) && !defined(CURL_STATICLIB)

#  if defined(BUILDING_LIBCURL)

#    define LIBHOSTNAME_EXTERN  __declspec(dllexport)

#  else

#    define LIBHOSTNAME_EXTERN  __declspec(dllimport)

#  endif

#else

#  ifdef CURL_HIDDEN_SYMBOLS

#    define LIBHOSTNAME_EXTERN CURL_EXTERN_SYMBOL

#  else

#    define LIBHOSTNAME_EXTERN

#  endif

#endif



LIBHOSTNAME_EXTERN int gethostname(char *name, GETHOSTNAME_TYPE_ARG2 namelen);