-/* context_java - implementation of context switching for java threads */
+/* Context switching within the JVM. */
-/* Copyright (c) 2009-2010, 2012-2014. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2009-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. */
#include "JavaContext.hpp"
#include "jxbt_utilities.h"
#include "src/simix/smx_private.h"
-#include "xbt/dynar.h"
-#include <simgrid/simix.h>
-#include <xbt/ex.h>
-#include <xbt/ex.hpp>
-#include <xbt/function_types.h>
+#include "xbt/ex.hpp"
-extern JavaVM *__java_vm;
+extern "C" JavaVM* __java_vm;
XBT_LOG_NEW_DEFAULT_CATEGORY(jmsg, "MSG for Java(TM)");