-/* xbt.h - Public interface to the xbt (simgrid's toolbox) */
+/* xbt.h - Public interface to the xbt (simgrid's toolbox) */
-/* Copyright (c) 2004-2018. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2004-2018. 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_MISC_H
#define XBT_MISC_H
-#include "simgrid_config.h"
-#include "base.h"
-#include "dynar.h"
+#include <simgrid_config.h>
+#include <xbt/base.h>
+#include <xbt/dynar.h>
#include <stdarg.h>
SG_BEGIN_DECL()
/** Cache the size of a memory page for the current system. */
-XBT_PUBLIC_DATA(int) xbt_pagesize;
+XBT_PUBLIC_DATA int xbt_pagesize;
/** Cache the number of bits of addresses inside a given page, log2(xbt_pagesize). */
-XBT_PUBLIC_DATA(int) xbt_pagebits;
+XBT_PUBLIC_DATA int xbt_pagebits;
/** Helps ensuring that header version (SIMGRID_VERSION_MAJOR and friends) and dynamic library version do match. */
XBT_PUBLIC void sg_version_check(int lib_version_major, int lib_version_minor, int lib_version_patch);
/** Contains all the parameters we got from the command line */
-XBT_PUBLIC_DATA(xbt_dynar_t) sg_cmdline;
+XBT_PUBLIC_DATA xbt_dynar_t sg_cmdline;
/* snprintf related functions */
/** @addtogroup XBT_str