JORTE: update license headers and clean-up includes

[orte.git] / orte / libjorte / JORTESubscriptionPropertiesGet.c

diff --git a/orte/libjorte/JORTESubscriptionPropertiesGet.c b/orte/libjorte/JORTESubscriptionPropertiesGet.c
index 73b82e620809183f16ecff3b889cb8972902e2b8..d11fdaab3364f68fb8cda8c342ef4056beb80c98 100644 (file)
--- a/orte/libjorte/JORTESubscriptionPropertiesGet.c
+++ b/orte/libjorte/JORTESubscriptionPropertiesGet.c
@@ -7,6 +7,7 @@
   * (by command 'javah -jni class_with_native_function')
   *
   * @author Lukas Pokorny (lukas_pokorny@centrum.cz)
+  * @author Martin Vajnar (martin.vajnar@gmail.com)
   * @author CTU FEE Prague - Department of Control Engineering (dce.felk.cvut.cz)
   * @author Project ORTE - OCERA Real Time Ethernet (www.ocera.org)
   * @author dedication to Kj
@@ -25,15 +26,7 @@
   *
   */
 
-#include <string.h>
-#include <stdlib.h>
-// library header file's path
-#include "orte.h"
-// enable TEST_STAGE run level
-#include "jorte/4all.h"
-// pregenerated header
-#include "jorte/org_ocera_orte_Subscription.h"
-#include "jorte/jorte_protos_api.h"
+#include "jorte/jorte.h"
 
 JNIEXPORT jobject JNICALL
 Java_org_ocera_orte_Subscription_jORTESubscriptionPropertiesGet
@@ -101,7 +94,7 @@ Java_org_ocera_orte_Subscription_jORTESubscriptionPropertiesGet
     // setting object's fields
     /////////////////////////////////////////////////
     // set topic
-    if(!setTopic(env,cls_sp,obj_sp,subs_prop->topic))
+    if(!setTopic(env,cls_sp,obj_sp,(const char *)subs_prop->topic))
     {
       #ifdef TEST_STAGE
         printf(":!c: setTopic() failed! \n");
@@ -110,7 +103,7 @@ Java_org_ocera_orte_Subscription_jORTESubscriptionPropertiesGet
     }
     /////////////////////////////////////////////////
     // set type
-    if(!setType(env,cls_sp,obj_sp,subs_prop->typeName))
+    if(!setType(env,cls_sp,obj_sp,(const char *)subs_prop->typeName))
     {
       #ifdef TEST_STAGE
         printf(":!c: setType() failed! \n");