[vlc-devel] Make vlc_network.h installable

[KO Myung-Hun]

Rémi Denis-Courmont wrote:
> vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu Nov  3 20:47:39 2011 +0200| [ff96809b407550ba64b949b24c7c143ab72961ca] | committer: Rémi Denis-Courmont
> 
> Make vlc_network.h installable
> 
>> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ff96809b407550ba64b949b24c7c143ab72961ca
> ---
> 
>  configure.ac          |    2 +-
>  include/vlc_network.h |   10 +---------
>  2 files changed, 2 insertions(+), 10 deletions(-)
> 
> diff --git a/configure.ac b/configure.ac
> index 5a4b021..be981b1 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -759,7 +759,7 @@ dnl Check for headers
>  AC_CHECK_HEADERS([search.h])
>  AC_CHECK_HEADERS(getopt.h strings.h locale.h xlocale.h)
>  AC_CHECK_HEADERS(fcntl.h sys/time.h sys/ioctl.h sys/stat.h)
> -AC_CHECK_HEADERS([arpa/inet.h netinet/in.h netinet/udplite.h sys/eventfd.h])
> +AC_CHECK_HEADERS([arpa/inet.h netinet/udplite.h sys/eventfd.h])
>  AC_CHECK_HEADERS([net/if.h], [], [],
>    [
>      #include <sys/types.h>
> diff --git a/include/vlc_network.h b/include/vlc_network.h
> index cd9ae90..64fbf89 100644
> --- a/include/vlc_network.h
> +++ b/include/vlc_network.h
> @@ -65,12 +65,7 @@ struct msghdr
>  #   endif
>  #else
>  #   include <sys/socket.h>
> -#   ifdef HAVE_NETINET_IN_H
> -#      include <netinet/in.h>
> -#   endif
> -#   ifdef HAVE_ARPA_INET_H
> -#      include <arpa/inet.h>
> -#   endif

This breaks the compilation on OS/2.

-----
  CC     os2/getaddrinfo.lo
os2/getaddrinfo.c: In function 'getaddrinfo':
os2/getaddrinfo.c:292: error: implicit declaration of function 'inet_addr'
-----

> +#   include <netinet/in.h>
>  #   include <netdb.h>
>  #   define net_errno errno
>  #endif
> @@ -179,9 +174,6 @@ VLC_API int vlc_poll(struct pollfd *fds, unsigned nfds, int timeout);
>  #  define SHUT_WR    1
>  #  define SHUT_RDWR  2
>  # endif
> -#ifdef HAVE_UNISTD_H
> -#include <unistd.h>
> -#endif

This breaks the compilation on OS/2.

-----
  CC     stream_output/sap.lo
stream_output/sap.c: In function 'AddressCreate':
stream_output/sap.c:131: error: implicit declaration of function 'close'
stream_output/sap.c: In function 'SAP_Add':

  CC     libaccess_mms_plugin_la-mmsh.lo
mmsh.c: In function 'Describe':
mmsh.c:684: error: implicit declaration of function 'close'

  CC     librtp_plugin_la-rtp.lo
rtp.c: In function 'Open':
rtp.c:248: error: implicit declaration of function 'close'

  CC     libaccess_realrtsp_plugin_la-access.lo
access.c: In function 'RtspDisconnect':
access.c:99: error: implicit declaration of function 'close'

  CC     libaccess_udp_plugin_la-udp.lo
udp.c: In function 'Close':
udp.c:151: error: implicit declaration of function 'close'

  CC     libaccess_tcp_plugin_la-tcp.lo
tcp.c: In function 'Close':
tcp.c:126: error: implicit declaration of function 'close'

  CC     libaccess_ftp_plugin_la-ftp.lo
ftp.c: In function 'Connect':
ftp.c:240: error: implicit declaration of function 'close'

  CC     libaudiobargraph_a_plugin_la-audiobargraph_a.lo
audiobargraph_a.c: In function 'DoWork':
audiobargraph_a.c:302: error: implicit declaration of function 'close'

  CC     libts_plugin_la-ts.lo
ts.c:915: error: implicit declaration of function 'close'
ts.c: In function 'DemuxFile':

  CC     libaudioscrobbler_plugin_la-audioscrobbler.lo
audioscrobbler.c: In function 'Run':
audioscrobbler.c:927: error: implicit declaration of function 'close'

  CC     libremoteosd_plugin_la-remoteosd.lo
remoteosd.c: In function 'vnc_worker_thread':
remoteosd.c:752: error: implicit declaration of function 'close'

  CC     libstream_out_raop_plugin_la-raop.lo
raop.c: In function 'FreeSys':
raop.c:195: error: implicit declaration of function 'close'

  CC     libstream_out_select_plugin_la-select.lo
select.c: In function 'Close':
select.c:173: error: implicit declaration of function 'close'

  CC     libstream_out_rtp_plugin_la-rtcp.lo
rtcp.c: In function 'OpenRTCP':
rtcp.c:130: error: implicit declaration of function 'close'

  CC     libstream_out_rtp_plugin_la-rtsp.lo
rtsp.c: In function 'RtspTrackClose':
rtsp.c:551: error: implicit declaration of function 'close'

  CC     liblua_plugin_la-net.lo
libs/net.c: In function 'vlclua_net_close':
libs/net.c:172: error: implicit declaration of function 'close'
libs/net.c: In function 'vlclua_fd_write':
libs/net.c:260: error: implicit declaration of function 'write'
libs/net.c: In function 'vlclua_fd_read':
libs/net.c:270: error: implicit declaration of function 'read'
-----

>  # define net_Close( fd ) (void)close (fd)
>  #endif
>  
> 

-- 
KO Myung-Hun

Using Mozilla SeaMonkey 2.0.14
Under OS/2 Warp 4 for Korean with FixPak #15
On AMD ThunderBird 1GHz with 512 MB RAM

Korean OS/2 User Community : http://www.ecomstation.co.kr