From 3f18c55fd588500b4f9d97c8c793db15659a91c9 Mon Sep 17 00:00:00 2001
From: Ralph Giles <giles@thaumas.net>
Date: Mon, 17 Sep 2012 08:43:28 -0700
Subject: [PATCH] Move opusfile.h up a level.
This matches the convention used by opus itself, where
headers are included without a prefix, and the build
must do -I/path/to/opus to find the appropriate versions.
---
examples/opusfile_example.c | 2 +-
examples/seeking_example.c | 2 +-
include/{opus => }/opusfile.h | 0
src/internal.h | 2 +-
src/opusfile.c | 2 +-
5 files changed, 4 insertions(+), 4 deletions(-)
rename include/{opus => }/opusfile.h (100%)
diff --git a/examples/opusfile_example.c b/examples/opusfile_example.c
index f9cf7c8..99240ba 100644
--- a/examples/opusfile_example.c
+++ b/examples/opusfile_example.c
@@ -11,7 +11,7 @@
# include <io.h>
# include <fcntl.h>
#endif
-#include <opus/opusfile.h>
+#include <opusfile.h>
int main(int _argc,const char **_argv){
OggOpusFile *of;
diff --git a/examples/seeking_example.c b/examples/seeking_example.c
index e1a74a2..d34b6f4 100644
--- a/examples/seeking_example.c
+++ b/examples/seeking_example.c
@@ -12,7 +12,7 @@
# include <io.h>
# include <fcntl.h>
#endif
-#include <opus/opusfile.h>
+#include <opusfile.h>
/*Use shorts, they're smaller.*/
#define OP_FIXED_POINT (1)
diff --git a/include/opus/opusfile.h b/include/opusfile.h
similarity index 100%
rename from include/opus/opusfile.h
rename to include/opusfile.h
diff --git a/src/internal.h b/src/internal.h
index 96dd22b..778f8c6 100644
--- a/src/internal.h
+++ b/src/internal.h
@@ -18,7 +18,7 @@
# endif
# include <stdlib.h>
-# include <opus/opusfile.h>
+# include <opusfile.h>
typedef struct OggOpusLink OggOpusLink;
# if defined(OP_FIXED_POINT)
diff --git a/src/opusfile.c b/src/opusfile.c
index 4b9f7e1..78f6add 100644
--- a/src/opusfile.c
+++ b/src/opusfile.c
@@ -22,7 +22,7 @@
#include <string.h>
#include <math.h>
-#include "opus/opusfile.h"
+#include "opusfile.h"
/*This implementation is largely based off of libvorbisfile.
All of the Ogg bits work roughly the same, though I have made some
--
GitLab