[gst-devel] Re: [gst-cvs] leroutier gst-plugins: gst-plugins/ gst-plugins/gst/tcp/ gst-plugins/m4/

[Thomas Vander Stichele]

Hi Stephane,

thanks for commiting this.

Could you rename the actual macro from HAVE_ to something like CHECK_ ?
HAVE_* is used for defines when things are enabled, I'd like to keep the
namespaces separated.

Thanks
Thomas

On Thu, 2004-05-20 at 21:19, Stephane Loeuillet wrote:
> CVS Root:       /cvs/gstreamer
> Module:         gst-plugins
> Changes by:     leroutier
> Date:           Thu May 20 2004  12:19:38 PDT
> 
> Log message:
> test FIONREAD ioctl presence in an alternate header for Solaris 10 (and perhaps earlier versions)
> 
> Modified files:
>     .               : configure.ac
>     gst/tcp         : gsttcpclientsrc.c
> Added files:
>     m4              : gst-fionread.m4
> 
> Links:
> http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/configure.ac.diff?r1=1.418&r2=1.419
> http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/gst/tcp/gsttcpclientsrc.c.diff?r1=1.1&r2=1.2
> http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/m4/gst-fionread.m4?rev=1.1&content-type=text/vnd.viewcvs-markup
> 
> ====Begin Diffs====
> --- NEW FILE: gst-fionread.m4 ---
> AC_DEFUN([HAVE_FIONREAD], [
> 
>   AC_MSG_CHECKING(for FIONREAD in sys/ioctl.h)
>   AC_CACHE_VAL(GST_FIONREAD_IN_SYS_IOCTL, [
>     AC_TRY_COMPILE([
> #include <sys/types.h>
> #include <sys/ioctl.h>
> ], [
> int x = FIONREAD;
> if ( x )
>   return 0;
>     ], GST_FIONREAD_IN_SYS_IOCTL="yes",GST_FIONREAD_IN_SYS_IOCTL="no")
>   ])
>   AC_MSG_RESULT($GST_FIONREAD_IN_SYS_IOCTL)
>   if test "$GST_FIONREAD_IN_SYS_IOCTL" = "yes"; then
>     AC_DEFINE([FIONREAD_IN_SYS_IOCTL], 1, [FIONREAD ioctl found in sys/ioclt.h])
>   else
>     AC_MSG_CHECKING(for FIONREAD in sys/filio.h)
>     AC_CACHE_VAL(GST_FIONREAD_IN_SYS_FILIO, [
>       AC_TRY_COMPILE([
>   #include <sys/types.h>
>   #include <sys/filio.h>
>   ], [
>   int x = FIONREAD;
>   if ( x )
>     return 0;
>       ], GST_FIONREAD_IN_SYS_FILIO="yes",GST_FIONREAD_IN_SYS_FILIO="no")
>     ])
>     AC_MSG_RESULT($GST_FIONREAD_IN_SYS_FILIO)
>     if test "$GST_FIONREAD_IN_SYS_FILIO" = "yes"; then   
>       AC_DEFINE([FIONREAD_IN_SYS_FILIO], 1, [FIONREAD ioctl found in sys/filio.h])
>     fi
>   fi
> ])
> Index: configure.ac
> ===================================================================
> RCS file: /cvs/gstreamer/gst-plugins/configure.ac,v
> retrieving revision 1.418
> retrieving revision 1.419
> diff -u -d -r1.418 -r1.419
> --- a/configure.ac	19 May 2004 16:10:22 -0000	1.418
> +++ b/configure.ac	20 May 2004 19:19:26 -0000	1.419
> @@ -95,6 +95,9 @@
>    AC_DEFINE(GST_LEVEL_DEFAULT, GST_LEVEL_ERROR, [Default errorlevel to use])
>  fi
>  
> +dnl Check for FIONREAD ioctl declaration :
> +HAVE_FIONREAD()
> +
>  dnl ############################################
>  dnl # Super Duper options for plug-in building #
> Index: gsttcpclientsrc.c
> RCS file: /cvs/gstreamer/gst-plugins/gst/tcp/gsttcpclientsrc.c,v
> retrieving revision 1.1
> retrieving revision 1.2
> diff -u -d -r1.1 -r1.2
> --- a/gsttcpclientsrc.c	20 May 2004 10:15:31 -0000	1.1
> +++ b/gsttcpclientsrc.c	20 May 2004 19:19:26 -0000	1.2
> @@ -33,6 +33,10 @@
>  #include <arpa/inet.h>
>  #include <sys/ioctl.h>
> +#ifdef FIONREAD_IN_SYS_FILIO
> +#include <sys/filio.h>
> +#endif
>  GST_DEBUG_CATEGORY (tcpclientsrc_debug);
>  #define GST_CAT_DEFAULT tcpclientsrc_debug
> 
> 
> -------------------------------------------------------
> This SF.Net email is sponsored by: Oracle 10g
> Get certified on the hottest thing ever to hit the market... Oracle 10g. 
> Take an Oracle 10g class now, and we'll give you the exam FREE.
> http://ads.osdn.com/?ad_id=3149&alloc_id=8166&op=click
> _______________________________________________
> gstreamer-cvs-verbose mailing list
> gstreamer-cvs-verbose at lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/gstreamer-cvs-verbose

Dave/Dina : future TV today ! - http://www.davedina.org/
<-*- thomas (dot) apestaart (dot) org -*->
"Don't worry, Joey, it's unisex."
"Maybe you need sex, I just had some a couple of days ago !"
"No, no, U-N-I-sex !"
"Well, I ain't gonna say no to that !"
<-*- thomas (at) apestaart (dot) org -*->
URGent, best radio on the net - 24/7 ! - http://urgent.fm/