From 85675ca0ab93da8e420fe819b6ceffd039425781 Mon Sep 17 00:00:00 2001 From: jsteffens Date: Sat, 31 Aug 2013 07:25:40 +0000 Subject: [PATCH] Fix linux build --- desmume/src/utils/fsnitro.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/desmume/src/utils/fsnitro.cpp b/desmume/src/utils/fsnitro.cpp index 31a7b5569..a4e6c1c0b 100644 --- a/desmume/src/utils/fsnitro.cpp +++ b/desmume/src/utils/fsnitro.cpp @@ -16,6 +16,8 @@ */ #include +#include +#include #include #include "fsnitro.h" @@ -192,7 +194,7 @@ bool FS_NITRO::loadFileTables() uintptr_t *store = new uintptr_t[numDirs]; if (!store) return false; - memset(store, NULL, sizeof(uintptr_t) * numDirs); + memset(store, 0, sizeof(uintptr_t) * numDirs); strcpy((char*)fnt[0].filename, "/"); fnt[0].parentID = 0xF000;