Merge branch 'master' into clean_events

[simgrid.git] / include / xbt / xbt_os_time.h

diff --git a/include/xbt/xbt_os_time.h b/include/xbt/xbt_os_time.h
index 1af3e60..e7b2c24 100644 (file)
--- a/include/xbt/xbt_os_time.h
+++ b/include/xbt/xbt_os_time.h
@@ -1,21 +1,22 @@
 /*  xbt/xbt_os_timer.h -- system dependency on time functions               */
 
-/* Copyright (c) 2007, 2009-2010, 2012-2014. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2007-2017. 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 _XBT_OS_TIMER_H
-#define _XBT_OS_TIMER_H
+#ifndef XBT_OS_TIMER_H
+#define XBT_OS_TIMER_H
 
 #include <xbt/misc.h>           /* XBT_PUBLIC */
 #include <stddef.h>             /* size_t */
 
-/** @brief get time in seconds 
+SG_BEGIN_DECL()
 
-  * gives  the  number  of  seconds since the Epoch (00:00:00 UTC, January 1, 1970).
-  */
+/** @brief get time in seconds
+ *
+ * gives  the  number  of  seconds since the Epoch (00:00:00 UTC, January 1, 1970).
+ */
 XBT_PUBLIC(double) xbt_os_time(void);
 XBT_PUBLIC(void) xbt_os_sleep(double sec);
 
@@ -37,4 +38,7 @@ XBT_PUBLIC(void) xbt_os_cputimer_stop(xbt_os_timer_t timer);
 XBT_PUBLIC(void) xbt_os_threadtimer_start(xbt_os_timer_t timer);
 XBT_PUBLIC(void) xbt_os_threadtimer_resume(xbt_os_timer_t timer);
 XBT_PUBLIC(void) xbt_os_threadtimer_stop(xbt_os_timer_t timer);
+
+SG_END_DECL()
+
 #endif