Move compat/ and bstr/ directory contents somewhere else

bstr.c doesn't really deserve its own directory, and compat had just
a few files, most of which may as well be in osdep. There isn't really
any justification for these extra directories, so get rid of them.

The compat/libav.h was empty - just delete it. We changed our approach
to API compatibility, and will likely not need it anymore.

8 files changed, 9 insertions, 9 deletions

diff --git a/common/codecs.c b/common/codecs.c
index 1cbab44969..f89ef0c318 100644
--- a/common/codecs.c
+++ b/common/codecs.c
@@ -17,7 +17,7 @@
 
 #include <assert.h>
 #include "talloc.h"
-#include "bstr/bstr.h"
+#include "misc/bstr.h"
 #include "common/msg.h"
 #include "codecs.h"
 
diff --git a/common/common.c b/common/common.c
index afab994d72..a74205dd92 100644
--- a/common/common.c
+++ b/common/common.c
@@ -22,7 +22,7 @@
 #include <libavutil/common.h>
 
 #include "talloc.h"
-#include "bstr/bstr.h"
+#include "misc/bstr.h"
 #include "common/common.h"
 
 #define appendf(ptr, ...) \
diff --git a/common/common.h b/common/common.h
index 6c759e9258..b9c3e1e5ea 100644
--- a/common/common.h
+++ b/common/common.h
@@ -24,7 +24,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 
-#include "compat/compiler.h"
+#include "osdep/compiler.h"
 #include "talloc.h"
 
 // double should be able to represent this exactly
diff --git a/common/msg.c b/common/msg.c
index 6bde6d481d..866cae5c9d 100644
--- a/common/msg.c
+++ b/common/msg.c
@@ -27,8 +27,8 @@
 
 #include "talloc.h"
 
-#include "bstr/bstr.h"
-#include "compat/atomics.h"
+#include "misc/bstr.h"
+#include "osdep/atomics.h"
 #include "common/common.h"
 #include "common/global.h"
 #include "misc/ring.h"
diff --git a/common/msg.h b/common/msg.h
index 80aec2f5b3..5ca868d4bb 100644
--- a/common/msg.h
+++ b/common/msg.h
@@ -24,7 +24,7 @@
 #include <stdlib.h>
 #include <stdint.h>
 
-#include "compat/compiler.h"
+#include "osdep/compiler.h"
 
 struct mp_log;
 
diff --git a/common/playlist.h b/common/playlist.h
index 73227f071c..ea0e3698a2 100644
--- a/common/playlist.h
+++ b/common/playlist.h
@@ -19,7 +19,7 @@
 #define MPLAYER_PLAYLIST_H
 
 #include <stdbool.h>
-#include "bstr/bstr.h"
+#include "misc/bstr.h"
 
 struct playlist_param {
     bstr name, value;
diff --git a/common/tags.c b/common/tags.c
index c722d5d89c..bc9d98ea2f 100644
--- a/common/tags.c
+++ b/common/tags.c
@@ -17,7 +17,7 @@
 
 #include <libavutil/dict.h>
 #include "tags.h"
-#include "bstr/bstr.h"
+#include "misc/bstr.h"
 
 void mp_tags_set_str(struct mp_tags *tags, const char *key, const char *value)
 {
diff --git a/common/tags.h b/common/tags.h
index 375289695f..b6db5f3df2 100644
--- a/common/tags.h
+++ b/common/tags.h
@@ -1,7 +1,7 @@
 #ifndef MP_TAGS_H
 #define MP_TAGS_H
 
-#include "bstr/bstr.h"
+#include "misc/bstr.h"
 
 struct mp_tags {
     char **keys;