Merge 'master' into mc

[simgrid.git] / src / simix / smx_synchro_private.h

diff --git a/src/simix/smx_synchro_private.h b/src/simix/smx_synchro_private.h
index e50c106..ad411fd 100644 (file)
--- a/src/simix/smx_synchro_private.h
+++ b/src/simix/smx_synchro_private.h
@@ -1,3 +1,9 @@
+/* Copyright (c) 2012, 2014. The SimGrid Team.
+ * All rights reserved.                                                     */
+
+/* This program is free software; you can redistribute it and/or modify it
+ * under the terms of the license (GNU LGPL) which comes with this package. */
+
 #ifndef _SIMIX_SYNCHRO_PRIVATE_H
 #define _SIMIX_SYNCHRO_PRIVATE_H
 
@@ -58,6 +64,10 @@ void SIMIX_pre_cond_broadcast(smx_simcall_t simcall, smx_cond_t cond);
 smx_sem_t SIMIX_pre_sem_init(smx_simcall_t simcall, unsigned int value);
 void SIMIX_pre_sem_destroy(smx_simcall_t simcall, smx_sem_t sem);
 void SIMIX_pre_sem_release(smx_simcall_t simcall, smx_sem_t sem);
-XBT_INLINE int SIMIX_pre_sem_would_block(smx_simcall_t simcall, smx_sem_t sem);
+static XBT_INLINE int SIMIX_pre_sem_would_block(smx_simcall_t simcall,
+                                                smx_sem_t sem)
+{
+  return SIMIX_sem_would_block(sem);
+}
 int SIMIX_pre_sem_get_capacity(smx_simcall_t simcall, smx_sem_t sem);
 #endif