Commit 1158db5f authored by Sam Hocevar's avatar Sam Hocevar
Browse files

* ./configure.ac.in: we no longer choke if libdvbpsi headers aren't here.

  * ./include/vlc_common.h: we don't try to include inttypes.h with Borland.
parent bd5e0649
...@@ -961,7 +961,7 @@ then ...@@ -961,7 +961,7 @@ then
AC_CHECK_HEADERS(dvbpsi/dr.h, AC_CHECK_HEADERS(dvbpsi/dr.h,
[ PLUGINS="${PLUGINS} ts_dvbpsi" [ PLUGINS="${PLUGINS} ts_dvbpsi"
LDFLAGS_ts_dvbpsi="${LDFLAGS_ts_dvbpsi} -ldvbpsi" ], LDFLAGS_ts_dvbpsi="${LDFLAGS_ts_dvbpsi} -ldvbpsi" ],
[ AC_MSG_ERROR([cannot find libdvbpsi headers]) ], [ AC_MSG_WARN([cannot find libdvbpsi headers]) ],
[#include <stdint.h> [#include <stdint.h>
#include <dvbpsi/dvbpsi.h> #include <dvbpsi/dvbpsi.h>
#include <dvbpsi/descriptor.h> #include <dvbpsi/descriptor.h>
......
...@@ -373,3 +373,8 @@ the Boston strangler is to the woman home alone. ...@@ -373,3 +373,8 @@ the Boston strangler is to the woman home alone.
-- #videolan -- #videolan
% %
<haroldo> hi I've got some nice xxx videos, and I'd like to exchange with
anyone
-- #videolan
%
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* Collection of useful common types and macros definitions * Collection of useful common types and macros definitions
***************************************************************************** *****************************************************************************
* Copyright (C) 1998, 1999, 2000 VideoLAN * Copyright (C) 1998, 1999, 2000 VideoLAN
* $Id: vlc_common.h,v 1.39 2002/11/20 08:58:20 sam Exp $ * $Id: vlc_common.h,v 1.40 2002/11/24 18:54:54 sam Exp $
* *
* Authors: Samuel Hocevar <sam@via.ecp.fr> * Authors: Samuel Hocevar <sam@via.ecp.fr>
* Vincent Seguin <seguin@via.ecp.fr> * Vincent Seguin <seguin@via.ecp.fr>
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
*****************************************************************************/ *****************************************************************************/
#if defined( __BORLANDC__ ) #if defined( __BORLANDC__ )
# undef PACKAGE # undef PACKAGE
# undef HAVE_INTTYPES_H
#endif #endif
#include "config.h" #include "config.h"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment