2 files changed, 5 insertions, 8 deletions
diff --git a/crawl-ref/source/macro.cc b/crawl-ref/source/macro.cc
index 4c812db129..d7d284b5f0 100644
--- a/crawl-ref/source/macro.cc
+++ b/crawl-ref/source/macro.cc
@@ -895,10 +895,8 @@ static void _read_macros_from(const char* filename)
     }
 }
 
-int macro_init( void )
+void macro_init()
 {
-    _read_macros_from(get_macro_file().c_str());
-
     const std::vector<std::string>& files = Options.additional_macro_files;
     for (std::vector<std::string>::const_iterator it = files.begin();
          it != files.end();
@@ -907,8 +905,7 @@ int macro_init( void )
         _read_macros_from(it->c_str());
     }
 
-
-    return 0;
+    _read_macros_from(get_macro_file().c_str());
 }
 
 
diff --git a/crawl-ref/source/macro.h b/crawl-ref/source/macro.h
index ad70244b88..be3a51d974 100644
--- a/crawl-ref/source/macro.h
+++ b/crawl-ref/source/macro.h
@@ -63,9 +63,9 @@ int getch_with_command_macros(void);  // keymaps and macros (ie for commands)
 
 void flush_input_buffer( int reason );
 
-void macro_add_query(void);
-int macro_init(void);
-void macro_save(void);
+void macro_add_query();
+void macro_init();
+void macro_save();
 
 void macro_userfn(const char *keys, const char *registryname);