diff options
Diffstat (limited to 'osdep')
-rw-r--r-- | osdep/cocoa_events.h | 2 | ||||
-rw-r--r-- | osdep/cocoa_events.m | 2 | ||||
-rw-r--r-- | osdep/getch2-win.c | 6 | ||||
-rw-r--r-- | osdep/getch2.c | 6 | ||||
-rw-r--r-- | osdep/macosx_finder_args.h | 2 | ||||
-rw-r--r-- | osdep/macosx_finder_args.m | 2 | ||||
-rw-r--r-- | osdep/priority.c | 2 | ||||
-rw-r--r-- | osdep/shmem.c | 2 | ||||
-rw-r--r-- | osdep/timer-darwin.c | 2 |
9 files changed, 13 insertions, 13 deletions
diff --git a/osdep/cocoa_events.h b/osdep/cocoa_events.h index 3f0e775e03..99f761e244 100644 --- a/osdep/cocoa_events.h +++ b/osdep/cocoa_events.h @@ -20,7 +20,7 @@ #ifndef MPLAYER_COCOA_EVENTS_H #define MPLAYER_COCOA_EVENTS_H -#include "input/input.h" +#include "core/input/input.h" void cocoa_events_init(struct input_ctx *ictx, void (*read_all_fd_events)(struct input_ctx *ictx, int time)); diff --git a/osdep/cocoa_events.m b/osdep/cocoa_events.m index e6d941d19b..e96d2e3cea 100644 --- a/osdep/cocoa_events.m +++ b/osdep/cocoa_events.m @@ -35,7 +35,7 @@ */ #include "cocoa_events.h" -#include "libvo/cocoa_common.h" +#include "video/out/cocoa_common.h" #include "talloc.h" #import <Cocoa/Cocoa.h> diff --git a/osdep/getch2-win.c b/osdep/getch2-win.c index de886182c9..c7607cee47 100644 --- a/osdep/getch2-win.c +++ b/osdep/getch2-win.c @@ -28,9 +28,9 @@ #include <stdint.h> #include <string.h> #include <windows.h> -#include "input/keycodes.h" -#include "input/input.h" -#include "mp_fifo.h" +#include "core/input/keycodes.h" +#include "core/input/input.h" +#include "core/mp_fifo.h" #include "getch2.h" int mp_input_slave_cmd_func(int fd,char* dest,int size){ diff --git a/osdep/getch2.c b/osdep/getch2.c index 6b41514a9e..c722922f88 100644 --- a/osdep/getch2.c +++ b/osdep/getch2.c @@ -53,9 +53,9 @@ #include <unistd.h> #include <fcntl.h> -#include "bstr.h" -#include "mp_fifo.h" -#include "input/keycodes.h" +#include "core/bstr.h" +#include "core/mp_fifo.h" +#include "core/input/keycodes.h" #include "getch2.h" #ifdef HAVE_TERMIOS diff --git a/osdep/macosx_finder_args.h b/osdep/macosx_finder_args.h index 3b0460cd0b..33a2936f05 100644 --- a/osdep/macosx_finder_args.h +++ b/osdep/macosx_finder_args.h @@ -20,7 +20,7 @@ #define MPLAYER_MACOSX_FINDER_ARGS_H #include <stdbool.h> -#include "m_config.h" +#include "core/m_config.h" struct playlist; bool macosx_finder_args(m_config_t *config, struct playlist *files, diff --git a/osdep/macosx_finder_args.m b/osdep/macosx_finder_args.m index a3eae773fd..e9038deaed 100644 --- a/osdep/macosx_finder_args.m +++ b/osdep/macosx_finder_args.m @@ -20,7 +20,7 @@ #import <ApplicationServices/ApplicationServices.h> #include <stdio.h> #include "talloc.h" -#include "playlist.h" +#include "core/playlist.h" #include "macosx_finder_args.h" static struct playlist *files = NULL; diff --git a/osdep/priority.c b/osdep/priority.c index dfa2c54ff5..81e9f6689f 100644 --- a/osdep/priority.c +++ b/osdep/priority.c @@ -26,7 +26,7 @@ #include <string.h> -#include "mp_msg.h" +#include "core/mp_msg.h" #include "priority.h" diff --git a/osdep/shmem.c b/osdep/shmem.c index 56b5b301b5..5fc7db19d3 100644 --- a/osdep/shmem.c +++ b/osdep/shmem.c @@ -38,7 +38,7 @@ #include <fcntl.h> #include <inttypes.h> -#include "mp_msg.h" +#include "core/mp_msg.h" #ifdef AIX #include <sys/select.h> diff --git a/osdep/timer-darwin.c b/osdep/timer-darwin.c index 13dcb104b7..1ce9cd584b 100644 --- a/osdep/timer-darwin.c +++ b/osdep/timer-darwin.c @@ -24,7 +24,7 @@ #include <mach/mach_time.h> #include "config.h" -#include "mp_msg.h" +#include "core/mp_msg.h" #include "timer.h" /* global variables */ |