trace: Consistent includes across all platforms
authorMoritz Hoffmann <moritz.hoffmann@inf.ethz.ch>
Tue, 16 Jun 2015 11:34:23 +0000 (13:34 +0200)
committerMoritz Hoffmann <moritz.hoffmann@inf.ethz.ch>
Tue, 16 Jun 2015 11:37:41 +0000 (13:37 +0200)
Signed-off-by: Moritz Hoffmann <moritz.hoffmann@inf.ethz.ch>

include/trace/trace.h

index ac3a27f..fcf4808 100644 (file)
 #endif
 
 
-#if defined(__x86_64__) || defined(__i386__)
 #ifndef IN_KERNEL
 /* XXX: private includes from libbarrelfish */
 #include <barrelfish/dispatcher_arch.h>
 #include <barrelfish/curdispatcher_arch.h>
 #else // IN_KERNEL
+#if defined(__x86_64__) || defined(__i386__)
 #include <arch/x86/apic.h> // XXX!
-#endif // IN_KERNEL
 #endif // __x86_64__ || __i386__
+#endif // IN_KERNEL
 
 #include <barrelfish/sys_debug.h>
 #include <barrelfish/waitset.h> // struct event_closure