summaryrefslogtreecommitdiff
path: root/libddekit/include/ddekit
diff options
context:
space:
mode:
authorZheng Da <zhengda1936@gmail.com>2009-12-06 05:14:54 +0100
committerZheng Da <zhengda1936@gmail.com>2009-12-06 05:14:54 +0100
commitb4bffcfcdf3ab7a55d664e9aa5907f88da503f38 (patch)
treeea865150eeb64bf519b1660c0624cf8a22931894 /libddekit/include/ddekit
parentd73efeeaba75cbdc5b3c23037f1e9f9f82d2d0c9 (diff)
The code can be compiled now.
Diffstat (limited to 'libddekit/include/ddekit')
-rw-r--r--libddekit/include/ddekit/assert.h4
-rw-r--r--libddekit/include/ddekit/condvar.h1
-rw-r--r--libddekit/include/ddekit/initcall.h42
-rw-r--r--libddekit/include/ddekit/thread.h2
4 files changed, 5 insertions, 44 deletions
diff --git a/libddekit/include/ddekit/assert.h b/libddekit/include/ddekit/assert.h
index 5d572b49..5d593662 100644
--- a/libddekit/include/ddekit/assert.h
+++ b/libddekit/include/ddekit/assert.h
@@ -1,8 +1,8 @@
#ifndef _ddekit_assert_h
#define _ddekit_assert_h
-#include <l4/dde/ddekit/printf.h>
-#include <l4/dde/ddekit/panic.h>
+#include "ddekit/printf.h"
+#include "ddekit/panic.h"
/** \file ddekit/assert.h */
diff --git a/libddekit/include/ddekit/condvar.h b/libddekit/include/ddekit/condvar.h
index ba87358d..129a718d 100644
--- a/libddekit/include/ddekit/condvar.h
+++ b/libddekit/include/ddekit/condvar.h
@@ -2,6 +2,7 @@
#define _ddekit_condvar_h
/** \file ddekit/condvar.h */
+#include "ddekit/lock.h"
struct ddekit_condvar;
typedef struct ddekit_condvar ddekit_condvar_t;
diff --git a/libddekit/include/ddekit/initcall.h b/libddekit/include/ddekit/initcall.h
deleted file mode 100644
index b503cc6a..00000000
--- a/libddekit/include/ddekit/initcall.h
+++ /dev/null
@@ -1,42 +0,0 @@
-#ifndef _ddekit_initcall_h
-#define _ddekit_initcall_h
-
-// from l4/sys/compiler.h
-#if (__GNUC__ == 3 && __GNUC_MINOR__ >= 3) || __GNUC__ >= 4
-#define L4_STICKY(x) __attribute__((used)) x
-#else
-#define L4_STICKY(x) __attribute__((unused)) x
-#endif
-
-#define l4str(s) #s
-
-// from dde_linux/ARCH-x86/ctor.h
-typedef void (*l4ddekit_initcall_t)(void);
-
-#define __l4ddekit_initcall(p) \
- __attribute__ ((__section__ (".l4dde_ctors." #p)))
-
-/** Define a function to be a DDEKit initcall.
- *
- * Define a function to be a DDEKit initcall. This function will then be placed
- * in a separate linker section of the binary (called .l4dde_ctors). The L4Env
- * construction mechanism will execute all constructors in this section during
- * application startup.
- *
- * This is the right place to place Linux' module_init functions & Co.
- *
- * \param fn function
- */
-#define DDEKIT_INITCALL(fn) DDEKIT_CTOR(fn, 1)
-
-#define DDEKIT_CTOR(fn, prio) \
- static l4ddekit_initcall_t \
- L4_STICKY(__l4ddekit_initcall_##fn) \
- __l4ddekit_initcall(prio) = (void *)fn
-
-/**
- * Runs all registered initcalls.
- */
-void ddekit_do_initcalls(void);
-
-#endif
diff --git a/libddekit/include/ddekit/thread.h b/libddekit/include/ddekit/thread.h
index 6e505818..8ed52013 100644
--- a/libddekit/include/ddekit/thread.h
+++ b/libddekit/include/ddekit/thread.h
@@ -3,6 +3,8 @@
/** \defgroup DDEKit_threads */
+#include "ddekit/lock.h"
+
struct ddekit_thread;
typedef struct ddekit_thread ddekit_thread_t;