From e856cc0ecdbfa7f0f07c459af2a2f3ed5a8f7515 Mon Sep 17 00:00:00 2001
From: Cristian Cadar <cristic@cs.stanford.edu>
Date: Sun, 11 Dec 2011 22:08:55 +0000
Subject: Patch by Ben Gras fixing a few minor issues: adds missing includes,
 fixes the ntohs prototype in klee-libc, and removes some unused code.

git-svn-id: https://llvm.org/svn/llvm-project/klee/trunk@146352 91177308-0d34-0410-b5e6-96231b3b80d8
---
 lib/Core/Executor.cpp     | 8 --------
 lib/Solver/Solver.cpp     | 1 +
 runtime/klee-libc/htonl.c | 2 +-
 tools/klee/main.cpp       | 1 +
 4 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/lib/Core/Executor.cpp b/lib/Core/Executor.cpp
index 6abd0234..64f67b4c 100644
--- a/lib/Core/Executor.cpp
+++ b/lib/Core/Executor.cpp
@@ -258,9 +258,6 @@ namespace {
 }
 
 
-static void *theMMap = 0;
-static unsigned theMMapSize = 0;
-
 namespace klee {
   RNG theRNG;
 }
@@ -3269,11 +3266,6 @@ void Executor::runFunctionAsMain(Function *f,
 
   if (statsTracker)
     statsTracker->done();
-
-  if (theMMap) {
-    munmap(theMMap, theMMapSize);
-    theMMap = 0;
-  }
 }
 
 unsigned Executor::getPathStreamID(const ExecutionState &state) {
diff --git a/lib/Solver/Solver.cpp b/lib/Solver/Solver.cpp
index 4059a82b..9f0d89af 100644
--- a/lib/Solver/Solver.cpp
+++ b/lib/Solver/Solver.cpp
@@ -29,6 +29,7 @@
 #include <vector>
 
 #include <errno.h>
+#include <unistd.h>
 #include <signal.h>
 #include <sys/wait.h>
 #include <sys/ipc.h>
diff --git a/runtime/klee-libc/htonl.c b/runtime/klee-libc/htonl.c
index cec2d0f5..521ef5d6 100644
--- a/runtime/klee-libc/htonl.c
+++ b/runtime/klee-libc/htonl.c
@@ -41,7 +41,7 @@ uint32_t htonl(uint32_t v) {
 
 #endif
 
-uint16_t ntohs(uint32_t v) {
+uint16_t ntohs(uint16_t v) {
   return htons(v);
 }
 uint32_t ntohl(uint32_t v) {
diff --git a/tools/klee/main.cpp b/tools/klee/main.cpp
index a5b8d046..82ced957 100644
--- a/tools/klee/main.cpp
+++ b/tools/klee/main.cpp
@@ -51,6 +51,7 @@
 #include <fstream>
 #include <cerrno>
 #include <dirent.h>
+#include <unistd.h>
 #include <errno.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
-- 
cgit 1.4.1