4 files changed, 32 insertions, 32 deletions

diff --git a/standalone/src/main/resources/cz/crcs/ectester/standalone/libs/jni/c_signals.c b/standalone/src/main/resources/cz/crcs/ectester/standalone/libs/jni/c_signals.c
index dd08bb8..b452787 100644
--- a/standalone/src/main/resources/cz/crcs/ectester/standalone/libs/jni/c_signals.c
+++ b/standalone/src/main/resources/cz/crcs/ectester/standalone/libs/jni/c_signals.c
@@ -37,7 +37,7 @@ void alarm_handler(int signo) {
 }
 
 
-sigjmp_buf *get_jmpbuf() {
+sigjmp_buf *get_jmpbuf_c() {
 	return &buf;
 }
 
@@ -51,7 +51,7 @@ void *timer(void *arg) {
 	return NULL;
 }
 
-void init_signals(sigjmp_buf *env, unsigned int timeout) {
+void init_signals_c(sigjmp_buf *env, unsigned int timeout) {
 	//printf("Initializing signals!\n");
 	struct sigaction action;
 	action.sa_sigaction = handler;
@@ -79,7 +79,7 @@ void init_signals(sigjmp_buf *env, unsigned int timeout) {
 }
 
 
-void deinit_signals() {
+void deinit_signals_c() {
 	//printf("Deinitializing signals!\n");
 	pthread_cancel(timer_thread);
 
@@ -91,11 +91,11 @@ void deinit_signals() {
 	initialized = false;
 }
 
-bool get_timedout() {
+bool get_timedout_c() {
 	return timedout;
 }
 
-jobject get_siginfo(JNIEnv *env) {
+jobject get_siginfo_c(JNIEnv *env) {
 	if (!caught) {
 		return NULL;
 	}
diff --git a/standalone/src/main/resources/cz/crcs/ectester/standalone/libs/jni/c_signals.h b/standalone/src/main/resources/cz/crcs/ectester/standalone/libs/jni/c_signals.h
index 3f3c473..a82b572 100644
--- a/standalone/src/main/resources/cz/crcs/ectester/standalone/libs/jni/c_signals.h
+++ b/standalone/src/main/resources/cz/crcs/ectester/standalone/libs/jni/c_signals.h
@@ -9,42 +9,42 @@
 /**
  *
  */
-void init_signals(jmp_buf *env, unsigned int timeout);
+void init_signals_c(jmp_buf *env, unsigned int timeout);
 
 /**
  *
  */
-sigjmp_buf *get_jmpbuf();
+sigjmp_buf *get_jmpbuf_c();
 
 /**
  *
  */
-void deinit_signals();
+void deinit_signals_c();
 
 /**
  *
  */
-bool get_timedout();
+bool get_timedout_c();
 
 /**
  *
  */
-jobject get_siginfo(JNIEnv *env);
+jobject get_siginfo_c(JNIEnv *env);
 
 
-#define SIG_TRY(timeout) 	init_signals(get_jmpbuf(), timeout); \
-							if (!sigsetjmp(*get_jmpbuf(), 1))
-#define SIG_CATCH() deinit_signals();
-#define SIG_DEINIT() deinit_signals();
+#define SIG_TRY(timeout) 	init_signals_c(get_jmpbuf_c(), timeout); \
+							if (!sigsetjmp(*get_jmpbuf_c(), 1))
+#define SIG_CATCH() deinit_signals_c();
+#define SIG_DEINIT() deinit_signals_c();
 #define SIG_HANDLE(env) do { \
-							jobject siginfo = get_siginfo(env); \
+							jobject siginfo = get_siginfo_c(env); \
 							if (siginfo != NULL) { \
 								jclass sigexception_class = (*env)->FindClass(env, "cz/crcs/ectester/standalone/libs/jni/SignalException"); \
 								jmethodID new_sigexception = (*env)->GetMethodID(env, sigexception_class, "<init>", "(Lcz/crcs/ectester/standalone/libs/jni/SigInfo;)V"); \
 								jobject sigexception = (*env)->NewObject(env, sigexception_class, new_sigexception, siginfo); \
 								(*env)->Throw(env, sigexception); \
 							} \
-							if (get_timedout()) { \
+							if (get_timedout_c()) { \
 								jclass timeoutexception_class = (*env)->FindClass(env, "cz/crcs/ectester/standalone/libs/jni/TimeoutException"); \
 								(*env)->ThrowNew(env, timeoutexception_class, "Operation timed out."); \
 							} \
diff --git a/standalone/src/main/resources/cz/crcs/ectester/standalone/libs/jni/cpp_signals.cpp b/standalone/src/main/resources/cz/crcs/ectester/standalone/libs/jni/cpp_signals.cpp
index 75bc17c..999349a 100644
--- a/standalone/src/main/resources/cz/crcs/ectester/standalone/libs/jni/cpp_signals.cpp
+++ b/standalone/src/main/resources/cz/crcs/ectester/standalone/libs/jni/cpp_signals.cpp
@@ -40,7 +40,7 @@ void alarm_handler(int signo) {
 }
 
 
-sigjmp_buf *get_jmpbuf() {
+sigjmp_buf *get_jmpbuf_cpp() {
 	return &buf;
 }
 
@@ -54,7 +54,7 @@ void *timer(void *arg) {
 	return NULL;
 }
 
-void init_signals(sigjmp_buf *env, unsigned int timeout) {
+void init_signals_cpp(sigjmp_buf *env, unsigned int timeout) {
 	//printf("Initializing signals!\n");
 	struct sigaction action;
 	action.sa_sigaction = handler;
@@ -82,7 +82,7 @@ void init_signals(sigjmp_buf *env, unsigned int timeout) {
 }
 
 
-void deinit_signals() {
+void deinit_signals_cpp() {
 	//printf("Deinitializing signals!\n");
 	pthread_cancel(timer_thread);
 
@@ -94,11 +94,11 @@ void deinit_signals() {
 	initialized = false;
 }
 
-bool get_timedout() {
+bool get_timedout_cpp() {
 	return timedout;
 }
 
-jobject get_siginfo(JNIEnv *env) {
+jobject get_siginfo_cpp(JNIEnv *env) {
 	if (!caught) {
 		return NULL;
 	}
diff --git a/standalone/src/main/resources/cz/crcs/ectester/standalone/libs/jni/cpp_signals.hpp b/standalone/src/main/resources/cz/crcs/ectester/standalone/libs/jni/cpp_signals.hpp
index b926656..4dc222f 100644
--- a/standalone/src/main/resources/cz/crcs/ectester/standalone/libs/jni/cpp_signals.hpp
+++ b/standalone/src/main/resources/cz/crcs/ectester/standalone/libs/jni/cpp_signals.hpp
@@ -12,42 +12,42 @@ extern "C"
 /**
  *
  */
-void init_signals(jmp_buf *env, unsigned int timeout);
+void init_signals_cpp(jmp_buf *env, unsigned int timeout);
 
 /**
  *
  */
-sigjmp_buf *get_jmpbuf();
+sigjmp_buf *get_jmpbuf_cpp();
 
 /**
  *
  */
-void deinit_signals();
+void deinit_signals_cpp();
 
 /**
  *
  */
-bool get_timedout();
+bool get_timedout_cpp();
 
 /**
  *
  */
-jobject get_siginfo(JNIEnv *env);
+jobject get_siginfo_cpp(JNIEnv *env);
 
 
-#define SIG_TRY(timeout) 	init_signals(get_jmpbuf(), timeout); \
-							if (!sigsetjmp(*get_jmpbuf(), 1))
-#define SIG_CATCH() deinit_signals();
-#define SIG_DEINIT() deinit_signals();
+#define SIG_TRY(timeout) 	init_signals_cpp(get_jmpbuf_cpp(), timeout); \
+							if (!sigsetjmp(*get_jmpbuf_cpp(), 1))
+#define SIG_CATCH() deinit_signals_cpp();
+#define SIG_DEINIT() deinit_signals_cpp();
 #define SIG_HANDLE(env) do { \
-							jobject siginfo = get_siginfo(env); \
+							jobject siginfo = get_siginfo_cpp(env); \
 							if (siginfo != NULL) { \
 								jclass sigexception_class = env->FindClass("cz/crcs/ectester/standalone/libs/jni/SignalException"); \
 								jmethodID new_sigexception = env->GetMethodID(sigexception_class, "<init>", "(Lcz/crcs/ectester/standalone/libs/jni/SigInfo;)V"); \
 								jobject sigexception = env->NewObject(sigexception_class, new_sigexception, siginfo); \
 								env->Throw((jthrowable) sigexception); \
 							} \
-							if (get_timedout()) { \
+							if (get_timedout_cpp()) { \
 								jclass timeoutexception_class = env->FindClass("cz/crcs/ectester/standalone/libs/jni/TimeoutException"); \
 								env->ThrowNew(timeoutexception_class, "Operation timed out."); \
 							} \