merged volatile memory barriers

[cacao.git] / src / vm / jit / oprofile-agent.cpp

diff --git a/src/vm/jit/oprofile-agent.cpp b/src/vm/jit/oprofile-agent.cpp
index 393697268dacc9ab29afca3bcabd1a8d88c9def0..5d35c222f1f0e9351a25ba3003d9b5308420f54b 100644 (file)
--- a/src/vm/jit/oprofile-agent.cpp
+++ b/src/vm/jit/oprofile-agent.cpp
@@ -22,12 +22,11 @@
 
 */
 
-
 #include "config.h"
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
-#include "vm/jit/code.h"
+#include "vm/jit/code.hpp"
 #include "vm/jit/oprofile-agent.hpp"
 
 #include <string.h>
@@ -44,7 +43,7 @@ void OprofileAgent::initialize(void)
 {
        _handle = op_open_agent();
        if (!_handle)
-               vm_abort_errno("unable to open opagent handle:");
+               os::abort_errno("unable to open opagent handle");
 }
 
 /**
@@ -94,15 +93,6 @@ void OprofileAgent::close()
 
        _handle = 0;
 }
-/* Legacy C interface *********************************************************/
-
-extern "C" {
-
-void OprofileAgent_initialize() { OprofileAgent::initialize(); }
-void OprofileAgent_newmethod(methodinfo *m) { OprofileAgent::newmethod(m); }
-void OprofileAgent_close() { OprofileAgent::close(); }
-
-}
 
 /*
  * These are local overrides for various environment variables in Emacs.
@@ -110,7 +100,7 @@ void OprofileAgent_close() { OprofileAgent::close(); }
  * Emacs will automagically detect them.
  * ---------------------------------------------------------------------
  * Local variables:
- * mode: c
+ * mode: c++
  * indent-tabs-mode: t
  * c-basic-offset: 4
  * tab-width: 4