Changeset e9d45e8fbedfe4a7cdbe8d2be1acec564f4c3c90

Show
Ignore:
Timestamp:
07/21/07 16:15:29 (1 year ago)
Author:
Christophe Mutricy <xtophe@videolan.org>
git-committer:
Christophe Mutricy <xtophe@videolan.org> 1185027329 +0000
git-parent:

[757fcfc93b469319a520b69c47458ef283c8df1f]

git-author:
Christophe Mutricy <xtophe@videolan.org> 1185027329 +0000
Message:

Better fix for <linux/videodev2.h> . Refs #1238

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • configure.ac

    r44e837a re9d45e8  
    23702370  then 
    23712371    AC_DEFINE_UNQUOTED(VIDEODEV2_H_FILE, "${with_videodev2}", [Location of videodev2.h]) 
    2372   else 
    2373   AC_DEFINE(VIDEODEV2_H_FILE, "linux/videodev2.h", [Location of videodev2.h]) 
     2372  dnl else 
     2373  dnl AC_DEFINE(VIDEODEV2_H_FILE, "linux/videodev2.h", [Location of videodev2.h]) 
    23742374  fi 
    23752375     
    …… 
    23772377  AC_CACHE_CHECK([for new linux/videodev2.h], 
    23782378      [new_linux_videodev2_h], 
    2379       [AC_TRY_COMPILE([#include <sys/types.h> 
    2380           #include VIDEODEV2_H_FILE], 
     2379      [AC_TRY_COMPILE([ 
     2380          #include <sys/types.h> 
     2381          #   ifdef VIDEODEV2_H_FILE 
     2382      #   include VIDEODEV2_H_FILE 
     2383      #   else 
     2384      #   include <linux/videodev2.h> 
     2385      #   endif 
     2386      ], 
    23812387          [struct v4l2_ext_controls ctrls; ctrls.ctrl_class = V4L2_CTRL_CLASS_MPEG; ], 
    23822388          new_linux_videodev2_h=yes, 

  • modules/access/pvr.c

    r1af4a45 re9d45e8  
    3939#include <sys/poll.h> 
    4040#ifdef HAVE_NEW_LINUX_VIDEODEV2_H 
    41 #include VIDEODEV2_H_FILE 
     41#   ifdef VIDEODEV2_H_FILE 
     42#   include VIDEODEV2_H_FILE 
     43#   else 
     44#   include <linux/videodev2.h> 
     45#   endif 
    4246#else 
    4347#include "videodev2.h"