Merge branch 'master' of https://github.com/86Box/86Box.git into EngiNerd

src/include/86box/chipset.h

@@ -146,6 +146,5 @@ extern const device_t	wd76c10_device;
 /* Miscellaneous Hardware */
 extern const device_t   phoenix_486_jumper_device;
 extern const device_t	vpc2007_device;
-extern const device_t   olivetti_m290_registers_device;
 
 #endif	/*EMU_CHIPSET_H*/

src/include/86box/fdc.h

@@ -34,7 +34,6 @@ extern int fdc_type;
 #define FDC_FLAG_NSC		0x80	/* PC87306, PC87309 */
 #define FDC_FLAG_TOSHIBA	0x100	/* T1000, T1200 */
 #define FDC_FLAG_AMSTRAD	0x200	/* Non-AT Amstrad machines */
-#define FDC_FLAG_NSDP		0x400   /* DP8473N, DP8473V */
 
 
 typedef struct {

src/include/86box/fdc_ext.h

@@ -27,6 +27,7 @@ extern int fdc_type;
 /* Controller types. */
 #define FDC_INTERNAL		0
 
+extern const device_t fdc_b215_device;
 extern const device_t fdc_pii151b_device;
 extern const device_t fdc_pii158b_device;
 

src/include/86box/machine.h

@@ -278,8 +278,6 @@ extern const device_t	*at_flytech386_get_device(void);
 extern const device_t	*at_commodore_sl386sx25_get_device(void);
 extern const device_t	*at_spc4620p_get_device(void);
 extern const device_t	*at_spc6033p_get_device(void);
-extern const device_t	*at_ncr3302_get_device(void);
-extern const device_t	*at_m300_08_get_device(void);
 #endif
 
 /* m_at_386dx_486.c */

src/include/tinyglib.h

@@ -271,7 +271,7 @@ g_strv_length(gchar **str_array)
 #define g_rand_free free
 #define g_realloc realloc
 #define g_snprintf snprintf
-#define g_strdup strdup
+#define g_strdup(str) str ? strdup(str) : NULL
 #define g_strerror strerror
 #define g_strfreev free
 #define g_string_append_printf sprintf /* unimplemented */