Make sure to link librt if we need to.

[qemu.git] / osdep.h

diff --git a/osdep.h b/osdep.h
index bc513ad3d5279e93b9c095306245390b281df6ca..dbc281f3bc0f7d3c2d5099233a6782ce5ea9612b 100644 (file)
--- a/osdep.h
+++ b/osdep.h
@@ -2,6 +2,10 @@
 #define QEMU_OSDEP_H
 
 #include <stdarg.h>
 #define QEMU_OSDEP_H
 
 #include <stdarg.h>

+#ifdef __OpenBSD__
+#include <sys/types.h>
+#include <sys/signal.h>
+#endif

 
 #ifndef glue
 #define xglue(x, y) x ## y
 
 #ifndef glue
 #define xglue(x, y) x ## y


@@ -19,6 +23,15 @@
 #define unlikely(x)   __builtin_expect(!!(x), 0)
 #endif
 
 #define unlikely(x)   __builtin_expect(!!(x), 0)
 #endif
 

+#ifndef offsetof
+#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *) 0)->MEMBER)
+#endif
+#ifndef container_of
+#define container_of(ptr, type, member) ({                      \
+        const typeof(((type *) 0)->member) *__mptr = (ptr);     \
+        (type *) ((char *) __mptr - offsetof(type, member));})
+#endif
+

 #ifndef MIN
 #define MIN(a, b) (((a) < (b)) ? (a) : (b))
 #endif
 #ifndef MIN
 #define MIN(a, b) (((a) < (b)) ? (a) : (b))
 #endif


@@ -26,34 +39,42 @@
 #define MAX(a, b) (((a) > (b)) ? (a) : (b))
 #endif
 
 #define MAX(a, b) (((a) > (b)) ? (a) : (b))
 #endif
 

+#ifndef ARRAY_SIZE
+#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
+#endif
+

 #ifndef always_inline
 #if (__GNUC__ < 3) || defined(__APPLE__)
 #define always_inline inline
 #else
 #define always_inline __attribute__ (( always_inline )) __inline__
 #ifndef always_inline
 #if (__GNUC__ < 3) || defined(__APPLE__)
 #define always_inline inline
 #else
 #define always_inline __attribute__ (( always_inline )) __inline__

+#ifdef __OPTIMIZE__
+#define inline always_inline

 #endif
 #endif
 #endif
 #endif

+#else

 #define inline always_inline
 #define inline always_inline

+#endif

 
 #ifdef __i386__
 
 #ifdef __i386__

-#define REGPARM(n) __attribute((regparm(n)))
+#define REGPARM __attribute((regparm(3)))

 #else
 #else

-#define REGPARM(n)
+#define REGPARM

 #endif
 
 #define qemu_printf printf
 
 #endif
 
 #define qemu_printf printf
 

-void *qemu_malloc(size_t size);
-void *qemu_mallocz(size_t size);
-void qemu_free(void *ptr);
-char *qemu_strdup(const char *str);
+#if defined (__GNUC__) && defined (__GNUC_MINOR__)
+# define QEMU_GNUC_PREREQ(maj, min) \
+         ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))
+#else
+# define QEMU_GNUC_PREREQ(maj, min) 0
+#endif

 
 void *qemu_memalign(size_t alignment, size_t size);
 void *qemu_vmalloc(size_t size);
 void qemu_vfree(void *ptr);
 
 
 void *qemu_memalign(size_t alignment, size_t size);
 void *qemu_vmalloc(size_t size);
 void qemu_vfree(void *ptr);
 

-void *get_mmap_addr(unsigned long size);
-

 int qemu_create_pidfile(const char *filename);
 
 #ifdef _WIN32
 int qemu_create_pidfile(const char *filename);
 
 #ifdef _WIN32