summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/mame.c
diff options
context:
space:
mode:
author Michaël Banaan Ananas <happppp@users.noreply.github.com>2010-05-13 20:55:15 +0000
committer Michaël Banaan Ananas <happppp@users.noreply.github.com>2010-05-13 20:55:15 +0000
commit728c619d0aa9e536c9159d2d8d5b8268d201f62a (patch)
treedfdb7d7cf9b5419bac3a3af93da29cc14bf00103 /src/emu/mame.c
parentb80779d95e7405b69f45c28486d103cce0ea92ed (diff)
fix NULL to UINT32 conversion
Diffstat (limited to 'src/emu/mame.c')
-rw-r--r--src/emu/mame.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/emu/mame.c b/src/emu/mame.c
index fd5adb93bc3..c9b1ae72f51 100644
--- a/src/emu/mame.c
+++ b/src/emu/mame.c
@@ -811,7 +811,7 @@ UINT8 *memory_region(running_machine *machine, const char *name)
UINT32 memory_region_length(running_machine *machine, const char *name)
{
const region_info *region = machine->region(name);
- return (region != NULL) ? region->length : NULL;
+ return (region != NULL) ? region->length : 0;
}
@@ -823,7 +823,7 @@ UINT32 memory_region_length(running_machine *machine, const char *name)
UINT32 memory_region_flags(running_machine *machine, const char *name)
{
const region_info *region = machine->region(name);
- return (region != NULL) ? region->flags : NULL;
+ return (region != NULL) ? region->flags : 0;
}