[MPlayer-cvslog] CVS: main/osdep fseeko.c, 1.2, 1.3 getch2-win.c, 1.6, 1.7 getch2.c, 1.19, 1.20 gettimeofday.c, 1.2, 1.3 glob-win.c, 1.2, 1.3 glob.h, 1.1, 1.2 scandir.c, 1.2, 1.3 shmem.c, 1.12, 1.13 strl.c, 1.3, 1.4 strsep.c, 1.1, 1.2 swab.c, 1.1, 1.2 timer-darwin.c, 1.6, 1.7 timer-lx.c, 1.10, 1.11 vsscanf.c, 1.1, 1.2

[Diego Biurrun CVS]

CVS change done by Diego Biurrun CVS

Update of /cvsroot/mplayer/main/osdep
In directory mail:/var2/tmp/cvs-serv22855/osdep

Modified Files:
	fseeko.c getch2-win.c getch2.c gettimeofday.c glob-win.c 
	glob.h scandir.c shmem.c strl.c strsep.c swab.c timer-darwin.c 
	timer-lx.c vsscanf.c 
Log Message:
Unify include paths, -I.. is in CFLAGS.


Index: fseeko.c
===================================================================
RCS file: /cvsroot/mplayer/main/osdep/fseeko.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fseeko.c	4 Apr 2004 10:38:57 -0000	1.2
+++ fseeko.c	14 Nov 2005 00:28:03 -0000	1.3
@@ -3,7 +3,7 @@
  *	  64-bit versions of fseeko/ftello() for systems which do not have them
  */
 
-#include "../config.h"
+#include "config.h"
  
 #if !defined(HAVE_FSEEKO) || !defined(HAVE_FTELLO)
 #include <stdio.h>

Index: getch2-win.c
===================================================================
RCS file: /cvsroot/mplayer/main/osdep/getch2-win.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- getch2-win.c	13 Aug 2004 13:32:43 -0000	1.6
+++ getch2-win.c	14 Nov 2005 00:28:03 -0000	1.7
@@ -6,7 +6,7 @@
 
 #include <windows.h>
 #include "keycodes.h"
-#include "../input/input.h"
+#include "input/input.h"
 
 int mp_input_win32_slave_cmd_func(int fd,char* dest,int size){
   DWORD retval;

Index: getch2.c
===================================================================
RCS file: /cvsroot/mplayer/main/osdep/getch2.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- getch2.c	25 May 2005 08:48:32 -0000	1.19
+++ getch2.c	14 Nov 2005 00:28:03 -0000	1.20
@@ -1,6 +1,6 @@
 /* GyS-TermIO v2.0 (for GySmail v3)          (C) 1999 A'rpi/ESP-team */
 
-#include "../config.h"
+#include "config.h"
 
 //#define USE_TERMCAP
 #if !defined(__OS2__) && !defined(__MORPHOS__)

Index: gettimeofday.c
===================================================================
RCS file: /cvsroot/mplayer/main/osdep/gettimeofday.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gettimeofday.c	4 Apr 2003 20:40:57 -0000	1.2
+++ gettimeofday.c	14 Nov 2005 00:28:03 -0000	1.3
@@ -1,4 +1,4 @@
-#include "../config.h"
+#include "config.h"
 
 #ifndef HAVE_GETTIMEOFDAY
 #include <sys/time.h>

Index: glob-win.c
===================================================================
RCS file: /cvsroot/mplayer/main/osdep/glob-win.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- glob-win.c	9 Jun 2003 12:15:48 -0000	1.2
+++ glob-win.c	14 Nov 2005 00:28:03 -0000	1.3
@@ -1,7 +1,7 @@
 #include <sys/types.h>
 #include <stdio.h>
 
-#include "../config.h"
+#include "config.h"
 
 #ifndef HAVE_GLOB
 #ifdef __MINGW32__

Index: glob.h
===================================================================
RCS file: /cvsroot/mplayer/main/osdep/glob.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- glob.h	25 Apr 2003 10:00:18 -0000	1.1
+++ glob.h	14 Nov 2005 00:28:03 -0000	1.2
@@ -1,4 +1,4 @@
-#include "../config.h"
+#include "config.h"
 
 #ifndef HAVE_GLOB
 #ifdef __MINGW32__

Index: scandir.c
===================================================================
RCS file: /cvsroot/mplayer/main/osdep/scandir.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- scandir.c	22 Jul 2005 22:52:13 -0000	1.2
+++ scandir.c	14 Nov 2005 00:28:03 -0000	1.3
@@ -4,7 +4,7 @@
  * implementation for systems that do not have it in libc
  */
 
-#include "../config.h"
+#include "config.h"
 
 #ifndef	HAVE_SCANDIR
 

Index: shmem.c
===================================================================
RCS file: /cvsroot/mplayer/main/osdep/shmem.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- shmem.c	11 Oct 2004 19:26:13 -0000	1.12
+++ shmem.c	14 Nov 2005 00:28:03 -0000	1.13
@@ -6,7 +6,7 @@
  *   Sun Apr  6 02:26:26 MET DST 1997
  */
 
-#include "../config.h"
+#include "config.h"
 
 #if defined(USE_STREAM_CACHE) && !defined(WIN32)
 
@@ -26,7 +26,7 @@
 #include <sys/socket.h>
 #include <fcntl.h>
 
-#include "../mp_msg.h"
+#include "mp_msg.h"
 
 #ifdef AIX
 #include <sys/select.h>

Index: strl.c
===================================================================
RCS file: /cvsroot/mplayer/main/osdep/strl.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- strl.c	25 Oct 2005 17:13:20 -0000	1.3
+++ strl.c	14 Nov 2005 00:28:03 -0000	1.4
@@ -4,7 +4,7 @@
  * (C) 2003-2004 Nicholas J. Kain <njk at aerifal.cx>
  */
 
-#include "../config.h"
+#include "config.h"
 
 #ifndef HAVE_STRLCPY
 unsigned int strlcpy (char *dest, const char *src, unsigned int size)

Index: strsep.c
===================================================================
RCS file: /cvsroot/mplayer/main/osdep/strsep.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- strsep.c	29 Mar 2002 21:24:36 -0000	1.1
+++ strsep.c	14 Nov 2005 00:28:03 -0000	1.2
@@ -3,7 +3,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "../config.h"
+#include "config.h"
 
 #ifndef HAVE_STRSEP
 char *strsep(char **stringp, const char *delim) {

Index: swab.c
===================================================================
RCS file: /cvsroot/mplayer/main/osdep/swab.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- swab.c	11 Oct 2004 19:26:13 -0000	1.1
+++ swab.c	14 Nov 2005 00:28:03 -0000	1.2
@@ -1,8 +1,8 @@
-#include "../config.h"
+#include "config.h"
 
 #ifndef	HAVE_SWAB
 /* system has no swab.  emulate via bswap */
-#include "../bswap.h"
+#include "bswap.h"
 #include <unistd.h>
 
 void swab(const void *from, void *to, ssize_t n) {

Index: timer-darwin.c
===================================================================
RCS file: /cvsroot/mplayer/main/osdep/timer-darwin.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- timer-darwin.c	27 Apr 2005 14:55:30 -0000	1.6
+++ timer-darwin.c	14 Nov 2005 00:28:03 -0000	1.7
@@ -22,8 +22,8 @@
 #include <sys/time.h>
 #include <mach/mach_time.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
+#include "config.h"
+#include "mp_msg.h"
 #include "timer.h"
 
 /* global variables */

Index: timer-lx.c
===================================================================
RCS file: /cvsroot/mplayer/main/osdep/timer-lx.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- timer-lx.c	11 Oct 2004 19:26:13 -0000	1.10
+++ timer-lx.c	14 Nov 2005 00:28:03 -0000	1.11
@@ -7,7 +7,7 @@
 #include <stdlib.h>
 #include <time.h>
 #include <sys/time.h>
-#include "../config.h"
+#include "config.h"
 
 const char *timer_name =
 #ifdef HAVE_NANOSLEEP

Index: vsscanf.c
===================================================================
RCS file: /cvsroot/mplayer/main/osdep/vsscanf.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vsscanf.c	26 Nov 2002 18:53:00 -0000	1.1
+++ vsscanf.c	14 Nov 2005 00:28:03 -0000	1.2
@@ -1,4 +1,4 @@
-#include "../config.h"
+#include "config.h"
 
 #ifndef	HAVE_VSSCANF
 /* system has no vsscanf.  try to provide one */