Mercurial > hg > xmms-sid

diff src/xs_config.c @ 946:f8e1de328ac1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix various compilation related issues, make includes more POSIX compliant, utilize autoconf detected stuff via conditionals as needed.
author Matti Hamalainen <ccr@tnsp.org>
date Mon, 19 Nov 2012 20:32:18 +0200
parents 63342bbeab47
children 5711abf1ff39
line wrap: on
line diff
--- a/src/xs_config.c	Mon Nov 19 18:28:52 2012 +0200
+++ b/src/xs_config.c	Mon Nov 19 20:32:18 2012 +0200
@@ -51,11 +51,9 @@
 #define XS_CFG_GET_INT(q,z)     xmms_cfg_read_int(cfg, XS_CONFIG_IDENT, q, z)
 #define XS_CFG_GET_BOOL(q,z)    xmms_cfg_read_boolean(cfg, XS_CONFIG_IDENT, q, z)
 #endif
-#include <stdio.h>
-#include <ctype.h>
+#include "xs_support.h"
 #include "xs_glade.h"
 #include "xs_interface.h"
-#include "xs_support.h"
 #include "xs_backend.h"
 
 /*
@@ -322,7 +320,7 @@
 #elif defined(HAVE_SIDPLAY1)
     xs_cfg.playerEngine = XS_ENG_SIDPLAY1;
     xs_cfg.memoryMode = XS_MPU_BANK_SWITCHING;
-#else
+#elif !defined(HAVE_SIDPLAYFP)
 #error This should not happen! No emulator engines configured in!
 #endif