Refactor headers

[wimlib] / programs / imagex.c

diff --git a/programs/imagex.c b/programs/imagex.c
index c5a653a68e002cd34ce32057defc4f55a1e49a82..b45d2d4b99232e0c2d1ba4daf3445318d58967e5 100644 (file)
--- a/programs/imagex.c
+++ b/programs/imagex.c
@@ -22,7 +22,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 

-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#  include "config.h" /* Need for PACKAGE_VERSION, etc. */
+#endif
+

 #include "wimlib.h"
 #include "wimlib_tchar.h"
 
 #include "wimlib.h"
 #include "wimlib_tchar.h"
 


@@ -40,7 +43,7 @@
 #include <locale.h>
 
 #ifdef HAVE_ALLOCA_H
 #include <locale.h>
 
 #ifdef HAVE_ALLOCA_H

-#include <alloca.h>
+#  include <alloca.h>

 #endif
 
 #ifdef __WIN32__
 #endif
 
 #ifdef __WIN32__


@@ -80,7 +83,7 @@ enum imagex_op_type {
 };
 
 static void usage(int cmd_type);
 };
 
 static void usage(int cmd_type);

-static void usage_all();
+static void usage_all(void);

 
 static bool imagex_be_quiet = false;
 
 
 static bool imagex_be_quiet = false;
 


@@ -3110,7 +3113,7 @@ static const struct imagex_command imagex_commands[] = {
 };
 
 static void
 };
 
 static void

-version()
+version(void)

 {
        static const tchar *s =
        T(
 {
        static const tchar *s =
        T(


@@ -3173,7 +3176,7 @@ usage(int cmd_type)
 }
 
 static void
 }
 
 static void

-usage_all()
+usage_all(void)

 {
        tfputs(T("Usage:\n"), stdout);
        for (int i = 0; i < ARRAY_LEN(usage_strings); i++)
 {
        tfputs(T("Usage:\n"), stdout);
        for (int i = 0; i < ARRAY_LEN(usage_strings); i++)