diff options
author | 2014-03-11 17:27:39 +0000 | |
---|---|---|
committer | 2014-03-11 17:27:39 +0000 | |
commit | d965157fcc88c752852f0c49e672f0be330ce545 (patch) | |
tree | 6e8218c2326c359ea47c424add5c363363ea0c25 | |
parent | 7f6756ef151c85c79e72712541ff25a00546fc39 (diff) |
more clang and Linux compilation fixes (nw)
-rw-r--r-- | src/emu/output.c | 2 | ||||
-rw-r--r-- | src/emu/softlist.c | 2 | ||||
-rw-r--r-- | src/lib/portmidi/pmlinuxalsa.c | 6 |
3 files changed, 3 insertions, 7 deletions
diff --git a/src/emu/output.c b/src/emu/output.c index 05fb234b150..ea29c381b35 100644 --- a/src/emu/output.c +++ b/src/emu/output.c @@ -78,6 +78,7 @@ static void output_exit(running_machine &machine); INLINE FUNCTIONS ***************************************************************************/ +#if 0 /*------------------------------------------------- copy_string - make a copy of a string -------------------------------------------------*/ @@ -88,6 +89,7 @@ INLINE const char *copy_string(const char *string) strcpy(newstring, string); return newstring; } +#endif /*------------------------------------------------- diff --git a/src/emu/softlist.c b/src/emu/softlist.c index 6e3ff5dc409..7609eae44d9 100644 --- a/src/emu/softlist.c +++ b/src/emu/softlist.c @@ -1254,7 +1254,7 @@ void softlist_parser::parse_data_start(const char *tagname, const char **attribu add_rom_entry(name, hashdata, 0, 0, ROMENTRYTYPE_ROM | (writeable ? DISK_READWRITE : DISK_READONLY)); } - else if (status == NULL || strcmp(status, "nodump") != NULL) // a no_dump chd is not an incomplete entry + else if (status == NULL || !strcmp(status, "nodump")) // a no_dump chd is not an incomplete entry parse_error("Incomplete disk definition"); } diff --git a/src/lib/portmidi/pmlinuxalsa.c b/src/lib/portmidi/pmlinuxalsa.c index 8d565deaac9..5e00dffd3f6 100644 --- a/src/lib/portmidi/pmlinuxalsa.c +++ b/src/lib/portmidi/pmlinuxalsa.c @@ -17,12 +17,6 @@ #include "pmlinux.h" #include "osdcomm.h" -#ifdef PTR64 -typedef UINT64 FPTR; -#else -typedef UINT32 FPTR; -#endif - #include <alsa/asoundlib.h> /* I used many print statements to debug this code. I left them in the |