[vlc-devel] commit: Remove useless check for time.h ( Rémi Denis-Courmont )

[git version control]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Fri Apr 10 16:38:58 2009 +0300| [26bc19853d930cea273eab07c87e06415f21f58e] | committer: Rémi Denis-Courmont 

Remove useless check for time.h

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=26bc19853d930cea273eab07c87e06415f21f58e
---

 configure.ac         |    2 +-
 modules/demux/ts.c   |    6 +-----
 modules/mux/mp4.c    |    7 +------
 modules/mux/ogg.c    |    4 ----
 src/input/vlm.c      |    6 +++---
 src/input/vlmshell.c |    5 +----
 6 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/configure.ac b/configure.ac
index 1c03f55..592bc90 100644
--- a/configure.ac
+++ b/configure.ac
@@ -829,7 +829,7 @@ AC_EGREP_HEADER(strncasecmp,strings.h,[
   AC_MSG_RESULT(no)])
 
 dnl Check for headers
-AC_CHECK_HEADERS(time.h getopt.h strings.h locale.h)
+AC_CHECK_HEADERS(getopt.h strings.h locale.h)
 AC_CHECK_HEADERS(fcntl.h sys/types.h sys/time.h sys/times.h sys/ioctl.h sys/stat.h xlocale.h)
 AC_CHECK_HEADERS([arpa/inet.h netinet/in.h netinet/udplite.h sys/eventfd.h])
 AC_CHECK_HEADERS([net/if.h], [], [],
diff --git a/modules/demux/ts.c b/modules/demux/ts.c
index 4cf15a8..5f4f8f7 100644
--- a/modules/demux/ts.c
+++ b/modules/demux/ts.c
@@ -77,9 +77,7 @@
 #       include "tables/eit.h"
 #   endif
 #endif
-#ifdef HAVE_TIME_H
-#   include <time.h>
-#endif
+#include <time.h>
 #undef TS_DEBUG
 
 /*****************************************************************************
@@ -1142,7 +1140,6 @@ static int DVBEventInformation( demux_t *p_demux, int64_t *pi_time, int64_t *pi_
     if( pi_time )
         *pi_time = 0;
 
-#ifdef HAVE_TIME_H
     if( p_sys->b_access_control && p_sys->i_dvb_length > 0 )
     {
         /* FIXME we should not use time() but read the date from the tdt */
@@ -1156,7 +1153,6 @@ static int DVBEventInformation( demux_t *p_demux, int64_t *pi_time, int64_t *pi_
             return VLC_SUCCESS;
         }
     }
-#endif
     return VLC_EGENERIC;
 }
 
diff --git a/modules/mux/mp4.c b/modules/mux/mp4.c
index d82da6e..92a251f 100644
--- a/modules/mux/mp4.c
+++ b/modules/mux/mp4.c
@@ -35,9 +35,7 @@
 #include <vlc_sout.h>
 #include <vlc_block.h>
 
-#ifdef HAVE_TIME_H
 #include <time.h>
-#endif
 
 #include <vlc_iso_lang.h>
 #include "vlc_meta.h"
@@ -2158,13 +2156,10 @@ static void box_send( sout_mux_t *p_mux,  bo_t *box )
 
 static int64_t get_timestamp(void)
 {
-    int64_t i_timestamp = 0;
+    int64_t i_timestamp = time(NULL);
 
-#ifdef HAVE_TIME_H
-    i_timestamp = time(NULL);
     i_timestamp += 2082844800; // MOV/MP4 start date is 1/1/1904
     // 208284480 is (((1970 - 1904) * 365) + 17) * 24 * 60 * 60
-#endif
 
     return i_timestamp;
 }
diff --git a/modules/mux/ogg.c b/modules/mux/ogg.c
index b767ed6..fcdfb8a 100644
--- a/modules/mux/ogg.c
+++ b/modules/mux/ogg.c
@@ -26,10 +26,6 @@
  * Preamble
  *****************************************************************************/
 
-#ifdef HAVE_TIME_H
-#   include <time.h>
-#endif
-
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
diff --git a/src/input/vlm.c b/src/input/vlm.c
index f903d4c..a3baba0 100644
--- a/src/input/vlm.c
+++ b/src/input/vlm.c
@@ -46,9 +46,9 @@
 #include <sys/time.h>                                      /* gettimeofday() */
 #endif
 
-#ifdef HAVE_TIME_H
-#   include <time.h>                                              /* ctime() */
-#   include <sys/timeb.h>                                         /* ftime() */
+#include <time.h>                                                 /* ctime() */
+#if defined (WIN32) && !defined (UNDER_CE)
+#include <sys/timeb.h>                                            /* ftime() */
 #endif
 
 #include <vlc_input.h>
diff --git a/src/input/vlmshell.c b/src/input/vlmshell.c
index 4ae8ffb..ba62608 100644
--- a/src/input/vlmshell.c
+++ b/src/input/vlmshell.c
@@ -44,10 +44,7 @@
 #   include <sys/time.h>                                   /* gettimeofday() */
 #endif
 
-#ifdef HAVE_TIME_H
-#   include <time.h>                                              /* ctime() */
-#   include <sys/timeb.h>                                         /* ftime() */
-#endif
+#include <time.h>                                                 /* ctime() */
 
 #include <vlc_input.h>
 #include "input_internal.h"