[syslinux:lwip] core thread: Don't include core.h from thread.h

syslinux-bot for Eric W. Biederman ebiederm at xmission.com
Fri Apr 22 20:05:09 PDT 2011


Commit-ID:  e23d01c50f80fa14cefa0e62fb8741a28eaa9776
Gitweb:     http://syslinux.zytor.com/commit/e23d01c50f80fa14cefa0e62fb8741a28eaa9776
Author:     Eric W. Biederman <ebiederm at xmission.com>
AuthorDate: Fri, 8 Apr 2011 15:24:20 -0700
Committer:  Eric W. Biederman <ebiederm at xmission.com>
CommitDate: Sat, 9 Apr 2011 18:27:07 -0700

core thread: Don't include core.h from thread.h

core.h brings in a lot of symbols and causes conflicts when
included into lwip, in particular conflicts on the symbol
lfree.

So do the simple thing and simplify what thread.h brings in to
reduce the change of symbol conflicts.

Signed-off-by: Eric W. Biederman <ebiederm at xmission.com>


---
 core/include/thread.h     |    3 ++-
 core/thread/exit_thread.c |    1 +
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/core/include/thread.h b/core/include/thread.h
index db4ef5e..cdc3a90 100644
--- a/core/include/thread.h
+++ b/core/include/thread.h
@@ -3,7 +3,8 @@
 
 #include <stddef.h>
 #include <inttypes.h>
-#include "core.h"
+#include <stdbool.h>
+#include <timer.h>
 
 struct semaphore;
 
diff --git a/core/thread/exit_thread.c b/core/thread/exit_thread.c
index a5f12af..0aadfb6 100644
--- a/core/thread/exit_thread.c
+++ b/core/thread/exit_thread.c
@@ -1,5 +1,6 @@
 #include "thread.h"
 #include <limits.h>
+#include <klibc/compiler.h>
 
 __noreturn __exit_thread(void)
 {



More information about the Syslinux-commits mailing list