diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-10-28 01:15:53 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-10-28 01:15:53 +0000 |
| commit | 5b0d96c6b48482bc434d735b35089bbfc8751742 (patch) | |
| tree | d4667543ec55dfa5a60c1595ebd0d39c9a3c83b7 /libvo/x11_common.c | |
| parent | 2f1aaba2077247345dff53542c5ae121e7189456 (diff) | |
| download | mpv-5b0d96c6b48482bc434d735b35089bbfc8751742.tar.bz2 mpv-5b0d96c6b48482bc434d735b35089bbfc8751742.tar.xz | |
Handle "xxx.h" vs "../xxx.h" include paths in a consistent way.
Based on a patch by Sebastian Hegler <s_hegler at gmx dot de>.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13788 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo/x11_common.c')
| -rw-r--r-- | libvo/x11_common.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libvo/x11_common.c b/libvo/x11_common.c index 0cf9c166c0..3e7d477028 100644 --- a/libvo/x11_common.c +++ b/libvo/x11_common.c @@ -20,7 +20,7 @@ #include "aspect.h" #include "geometry.h" #include "help_mp.h" -#include "../osdep/timer.h" +#include "osdep/timer.h" #include <X11/Xmd.h> #include <X11/Xlib.h> @@ -45,12 +45,12 @@ #include <X11/extensions/Xvlib.h> #endif -#include "../input/input.h" -#include "../input/mouse.h" +#include "input/input.h" +#include "input/mouse.h" #ifdef HAVE_NEW_GUI -#include "../Gui/interface.h" -#include "../mplayer.h" +#include "Gui/interface.h" +#include "mplayer.h" #endif #define WIN_LAYER_ONBOTTOM 2 @@ -523,7 +523,7 @@ void vo_uninit(void) mDisplay = NULL; } -#include "../osdep/keycodes.h" +#include "osdep/keycodes.h" #include "wskeys.h" extern void mplayer_put_key(int code); |