diff dvdnav_internal.h @ 250:12cdd1369f77 src

patch from FrantiĄŻek to avoid symbol name clashes
author mroi
date Sun, 12 Sep 2004 15:18:16 +0000
parents eaa775ba1306
children 0f055e94eb9c
line wrap: on
line diff
--- a/dvdnav_internal.h	Sun Sep 12 15:12:43 2004 +0000
+++ b/dvdnav_internal.h	Sun Sep 12 15:18:16 2004 +0000
@@ -1,5 +1,5 @@
 /* 
- * Copyright (C) 2001 Rich Wareham <richwareham@users.sourceforge.net>
+ * Copyright (C) 2001-2004 Rich Wareham <richwareham@users.sourceforge.net>
  * 
  * This file is part of libdvdnav, a DVD navigation library.
  * 
@@ -47,7 +47,7 @@
 
 /* replacement gettimeofday implementation */
 #include <sys/timeb.h>
-static inline int gettimeofday( struct timeval *tv, void *tz )
+static inline int _private_gettimeofday( struct timeval *tv, void *tz )
 {
   struct timeb t;
   ftime( &t );
@@ -55,6 +55,7 @@
   tv->tv_usec = t.millitm * 1000;
   return 0;
 }
+#define gettimeofday(TV, TZ) _private_gettimeofday((TV), (TZ))
 #include <io.h> /* read() */
 #define lseek64 _lseeki64