Merge branch 'master' of https://github.com/libretro/RetroArch

libretro-common/formats/libchdr/bitstream.c

@@ -9,8 +9,8 @@
 
 ***************************************************************************/
 
-#include "bitstream.h"
 #include <stdlib.h>
+#include <libchdr/bitstream.h>
 
 /***************************************************************************
  *  INLINE FUNCTIONS

libretro-common/formats/libchdr/cdrom.c

@@ -24,7 +24,7 @@
 
 #include <retro_inline.h>
 
-#include "cdrom.h"
+#include <libchdr/cdrom.h>
 
 /***************************************************************************
     DEBUGGING

libretro-common/formats/libchdr/chd.c

@@ -41,15 +41,15 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "chd.h"
+#include <libchdr/chd.h>
-#include "cdrom.h"
+#include <libchdr/minmax.h>
-#include "flac.h"
+#include <libchdr/cdrom.h>
-#include "huffman.h"
+#include <libchdr/flac.h>
+#include <libchdr/huffman.h>
 #include "zlib.h"
 #include "LzmaEnc.h"
 #include "LzmaDec.h"
-#include "retro_inline.h"
+#include <retro_inline.h>
-#include "minmax.h"
 
 #define TRUE 1
 #define FALSE 0

libretro-common/formats/libchdr/flac.c

@@ -11,8 +11,8 @@
 
 #include <assert.h>
 #include <string.h>
-#include "flac.h"
+#include <libchdr/flac.h>
-#include "minmax.h"
+#include <libchdr/minmax.h>
 
 /***************************************************************************
  *  FLAC DECODER

libretro-common/formats/libchdr/huffman.c

@@ -101,8 +101,8 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "huffman.h"
+#include <libchdr/huffman.h>
-#include "minmax.h"
+#include <libchdr/minmax.h>
 
 /***************************************************************************
  *  MACROS

libretro-common/streams/chd_stream.c

@@ -27,7 +27,7 @@
 
 #include <streams/chd_stream.h>
 #include <retro_endianness.h>
-#include <chd.h>
+#include <libchdr/chd.h>
 
 #define SECTOR_SIZE 2352
 #define SUBCODE_SIZE 96