Merge pull request #2 from dankamongmen/dankamongmen/compile-fix

Clean up a few small compilation issues
ljessendk · May 22, 2019 · a95b22a · a95b22a
2 parents 364f2ce + 94bce2c
commit a95b22a
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/examples/DS401_Master/TestMaster.h b/examples/DS401_Master/TestMaster.h
@@ -8,7 +8,7 @@
 
 /* Prototypes of function provided by object dictionnary */
 UNS32 TestMaster_valueRangeTest (UNS8 typeValue, void * value);
-const indextable * TestMaster_scanIndexOD (UNS16 wIndex, UNS32 * errorCode, ODCallback_t **callbacks);
+const CONSTSTORE indextable * TestMaster_scanIndexOD (UNS16 wIndex, UNS32 * errorCode, ODCallback_t **callbacks);
 
 /* Master node data struct */
 extern CO_Data TestMaster_Data;

diff --git a/examples/DS401_Slave_Gui/CallBack.cpp b/examples/DS401_Slave_Gui/CallBack.cpp
@@ -86,9 +86,10 @@ Call_post_TPDO (CO_Data * d)
   //*textLog << wxT("Post_TPDO\n");
 }
 
-void
+unsigned
 Call_storeODSubIndex (CO_Data * d, UNS16 wIndex, UNS8 bSubindex)
 {
   /*printf ("StoreODSubIndex : %4.4x %2.2x\n", wIndex, bSubindex);*/
   //*textLog << wxT("StoreODSubIndex :\n");
+  return 0;
 }
diff --git a/examples/DS401_Slave_Gui/CallBack.h b/examples/DS401_Slave_Gui/CallBack.h
@@ -17,6 +17,6 @@ void Call_stopped (CO_Data * d);
 
 void Call_post_sync (CO_Data * d);
 void Call_post_TPDO (CO_Data * d);
-void Call_storeODSubIndex (CO_Data * d, UNS16 wIndex, UNS8 bSubindex);
+unsigned Call_storeODSubIndex (CO_Data * d, UNS16 wIndex, UNS8 bSubindex);
 
 #endif /*CALLBACK_H_ */
diff --git a/examples/DS401_Slave_Gui/ObjDict.h b/examples/DS401_Slave_Gui/ObjDict.h
@@ -8,7 +8,7 @@
 
 /* Prototypes of function provided by object dictionnary */
 UNS32 ObjDict_valueRangeTest (UNS8 typeValue, void * value);
-const indextable * ObjDict_scanIndexOD (UNS16 wIndex, UNS32 * errorCode, ODCallback_t **callbacks);
+const CONSTSTORE indextable * ObjDict_scanIndexOD (UNS16 wIndex, UNS32 * errorCode, ODCallback_t **callbacks);
 
 /* Master node data struct */
 extern CO_Data ObjDict_Data;

diff --git a/include/unix/canfestival.h b/include/unix/canfestival.h
@@ -14,7 +14,6 @@ extern "C" {
 #endif
 
 typedef void* LIB_HANDLE;
-struct CO_Data;
 
 /** @defgroup userapi User API */
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,7 +14,6 @@ extern "C" { @@
     #endif
     typedef void* LIB_HANDLE;
-    struct CO_Data;
     /** @defgroup userapi User API */
@@ Expand Down @@