Uniquely namespace libchdr source files

Makefile.common

@@ -1500,11 +1500,11 @@ ifeq ($(HAVE_7ZIP), 1)
 ifeq ($(HAVE_ZLIB), 1)
    DEFINES += -DHAVE_CHD -DWANT_SUBCODE -DWANT_RAW_DATA_SECTOR
    CFLAGS  += -I$(LIBRETRO_COMM_DIR)/formats/libchdr
-   OBJ     += $(LIBRETRO_COMM_DIR)/formats/libchdr/bitstream.o \
+   OBJ     += $(LIBRETRO_COMM_DIR)/formats/libchdr/libchdr_bitstream.o \
-              $(LIBRETRO_COMM_DIR)/formats/libchdr/cdrom.o \
+              $(LIBRETRO_COMM_DIR)/formats/libchdr/libchdr_cdrom.o \
-              $(LIBRETRO_COMM_DIR)/formats/libchdr/chd.o \
+              $(LIBRETRO_COMM_DIR)/formats/libchdr/libchdr_chd.o \
-              $(LIBRETRO_COMM_DIR)/formats/libchdr/flac.o \
+              $(LIBRETRO_COMM_DIR)/formats/libchdr/libchdr_flac.o \
-              $(LIBRETRO_COMM_DIR)/formats/libchdr/huffman.o \
+              $(LIBRETRO_COMM_DIR)/formats/libchdr/libchdr_huffman.o \
               $(LIBRETRO_COMM_DIR)/streams/chd_stream.o
 endif
 endif

griffin/griffin.c

@@ -1307,11 +1307,11 @@ DEPENDENCIES
 #endif
 
 #ifdef HAVE_CHD
-#include "../libretro-common/formats/libchdr/bitstream.c"
+#include "../libretro-common/formats/libchdr/libchdr_bitstream.c"
-#include "../libretro-common/formats/libchdr/cdrom.c"
+#include "../libretro-common/formats/libchdr/libchdr_cdrom.c"
-#include "../libretro-common/formats/libchdr/chd.c"
+#include "../libretro-common/formats/libchdr/libchdr_chd.c"
-#include "../libretro-common/formats/libchdr/flac.c"
+#include "../libretro-common/formats/libchdr/libchdr_flac.c"
-#include "../libretro-common/formats/libchdr/huffman.c"
+#include "../libretro-common/formats/libchdr/libchdr_huffman.c"
 
 #include "../libretro-common/streams/chd_stream.c"
 #endif