Permalink
Browse files

Fix the build.

  • Loading branch information...
1 parent 7a30dcc commit e70d60d39d8fccf3b8259d36ff192d8ad5963850 @vargaz vargaz committed Mar 28, 2013
Showing with 5 additions and 3 deletions.
  1. +1 −0 mono/io-layer/collection.c
  2. +1 −0 mono/io-layer/handles-private.h
  3. +1 −1 mono/io-layer/wthreads.c
  4. +2 −2 support/signal.c
@@ -17,6 +17,7 @@
#include <mono/io-layer/wapi.h>
#include <mono/io-layer/collection.h>
#include <mono/io-layer/handles-private.h>
+#include <mono/utils/atomic.h>
#if 0
// #define DEBUG(...) g_message(__VA_ARGS__)
@@ -21,6 +21,7 @@
#include <mono/io-layer/misc-private.h>
#include <mono/io-layer/collection.h>
#include <mono/io-layer/shared.h>
+#include <mono/utils/atomic.h>
#define _WAPI_PRIVATE_MAX_SLOTS (1024 * 16)
#define _WAPI_PRIVATE_HANDLES(x) (_wapi_private_handles [x / _WAPI_HANDLE_INITIAL_COUNT][x % _WAPI_HANDLE_INITIAL_COUNT])
View
@@ -28,10 +28,10 @@
#include <mono/io-layer/mono-mutex.h>
#include <mono/io-layer/thread-private.h>
#include <mono/io-layer/mutex-private.h>
-#include <mono/io-layer/atomic.h>
#include <mono/utils/mono-threads.h>
#include <mono/utils/gc_wrapper.h>
+#include <mono/utils/atomic.h>
#ifdef HAVE_VALGRIND_MEMCHECK_H
#include <valgrind/memcheck.h>
View
@@ -27,7 +27,7 @@
#include <stdlib.h>
#include <string.h>
#include <pthread.h>
-#include <mono/io-layer/atomic.h>
+#include <mono/utils/atomic.h>
#include <mono/metadata/appdomain.h>
#endif
@@ -107,7 +107,7 @@ int Mono_Posix_FromRealTimeSignum (int offset, int *r)
#ifndef HOST_WIN32
-#ifdef WAPI_ATOMIC_ASM
+#ifndef WAPI_NO_ATOMIC_ASM
#define mph_int_get(p) InterlockedExchangeAdd ((p), 0)
#define mph_int_inc(p) InterlockedIncrement ((p))
#define mph_int_dec_test(p) (InterlockedDecrement ((p)) == 0)

0 comments on commit e70d60d

Please sign in to comment.