Resolve duplicated static vars in shared headers

mpglib/output.c

@@ -74,6 +74,9 @@
 #include "config.h"
 #include "output.h"
 
+struct audio_out oss_out;
+struct mp3_audio_out mp3_out;
+
 static int sample_rate;
 static int chans;
 

mpglib/output.h

@@ -62,8 +62,8 @@ struct oss_out {
 #define AFMT_S32_BE 0x00002000
 #endif
 
-struct audio_out oss_out;
-struct mp3_audio_out mp3_out;
+extern struct audio_out oss_out;
+extern struct mp3_audio_out mp3_out;
 
 #define STORE16LE(a,b) {                                                             \
                          ((uint8_t *)a)[0] = (uint8_t)((uint16_t)(b) & 0xFF);        \

vcdlib/libvcd.c

@@ -36,6 +36,9 @@
 #include "inttypes.h"
 #include "vcd_iso.h"
 
+int (* read_sectors)(void *buffer, int sector, int cnt);
+int (* read_toc)(CDROM_TOC *toc_buffer, int session);
+
 /* Stuff I should have in a header file somewhere... */
 extern int vcd_play_chapter(_EntriesVcd_sim *entries_list, uint16 chapter);
 extern int vcd_play_still(int chapter_lba);

vcdlib/vcd_iso.h

@@ -25,6 +25,9 @@
  *
  */
 
+#ifndef __VCD_ISO_H
+#define __VCD_ISO_H
+
 /* Some defines for submode byte bitmasks--values same as in vcdimager/include/libvcd/sector.h */
 #define AUTOPAUSE (1<<4)	/* called SM_TRIG in vcdimager. */
 #define FORM_2 (1<<5) 		/* called SM_FORM2 in vcdimager. */
@@ -73,10 +76,12 @@ int fs_bincue_mount(const char* fn);
 int fs_bincue_unmount();
 
 /* Pointer to either cdrom_read_sectors or bincue_read_sectors. */
-int (* read_sectors)(void *buffer, int sector, int cnt);
+extern int (* read_sectors)(void *buffer, int sector, int cnt);
+extern int (* read_toc)(CDROM_TOC *toc_buffer, int session);
 void bincue_set_sector_size(int sect_size);
-int (* read_toc)(CDROM_TOC *toc_buffer, int session);
+
 
 int vcd_read_toc(CDROM_TOC *toc_buffer, int session);
 
 void bsod();
+#endif /* __VCD_ISO_H */
\ No newline at end of file