From 688e26796fd7b506ef7cd2c2a73370ad7da97336 Mon Sep 17 00:00:00 2001
From: Kimmo Varis <kimmov@gmail.com>
Date: Sun, 5 Sep 2010 11:47:31 +0300
Subject: [PATCH] Fix compiling with GCC.

---
 Makefile              | 8 ++++++--
 cli/cmdlineparser.cpp | 3 ++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index c82c0e54f..41967594b 100644
--- a/Makefile
+++ b/Makefile
@@ -33,7 +33,8 @@ LIBOBJ =     lib/checkautovariables.o \
               lib/token.o \
               lib/tokenize.o
 
-CLIOBJ =     cli/cppcheckexecutor.o \
+CLIOBJ =     cli/cmdlineparser.o \
+              cli/cppcheckexecutor.o \
               cli/main.o \
               cli/threadexecutor.o
 
@@ -165,7 +166,10 @@ lib/token.o: lib/token.cpp lib/token.h lib/errorlogger.h lib/check.h lib/tokeniz
 lib/tokenize.o: lib/tokenize.cpp lib/tokenize.h lib/classinfo.h lib/token.h lib/filelister.h lib/mathlib.h lib/settings.h lib/errorlogger.h lib/check.h
 	$(CXX) $(CXXFLAGS) -Ilib -c -o lib/tokenize.o lib/tokenize.cpp
 
-cli/cppcheckexecutor.o: cli/cppcheckexecutor.cpp cli/cppcheckexecutor.h lib/errorlogger.h lib/settings.h lib/cppcheck.h lib/checkunusedfunctions.h lib/check.h lib/token.h lib/tokenize.h lib/classinfo.h cli/threadexecutor.h
+cli/cmdlineparser.o: cli/cmdlineparser.cpp cli/cmdlineparser.h lib/cppcheck.h lib/settings.h lib/errorlogger.h lib/checkunusedfunctions.h lib/check.h lib/token.h lib/tokenize.h lib/classinfo.h lib/timer.h
+	$(CXX) $(CXXFLAGS) -Ilib -c -o cli/cmdlineparser.o cli/cmdlineparser.cpp
+
+cli/cppcheckexecutor.o: cli/cppcheckexecutor.cpp cli/cppcheckexecutor.h lib/errorlogger.h lib/settings.h lib/cppcheck.h lib/checkunusedfunctions.h lib/check.h lib/token.h lib/tokenize.h lib/classinfo.h cli/threadexecutor.h cli/cmdlineparser.h lib/filelister.h
 	$(CXX) $(CXXFLAGS) -Ilib -c -o cli/cppcheckexecutor.o cli/cppcheckexecutor.cpp
 
 cli/main.o: cli/main.cpp cli/cppcheckexecutor.h lib/errorlogger.h lib/settings.h
diff --git a/cli/cmdlineparser.cpp b/cli/cmdlineparser.cpp
index 7104d0981..b6743d06c 100644
--- a/cli/cmdlineparser.cpp
+++ b/cli/cmdlineparser.cpp
@@ -20,10 +20,11 @@
 #include <sstream>
 #include <fstream>
 #include <string>
-#include "cmdlineparser.h"
+#include <cstring>
 #include "cppcheck.h"
 #include "timer.h"
 #include "settings.h"
+#include "cmdlineparser.h"
 
 
 static void AddFilesToList(const std::string& FileList, std::vector<std::string>& PathNames)