From: Michal Sojka <sojkam1@fel.cvut.cz>
Date: Fri, 18 Jun 2010 14:14:23 +0000 (+0200)
Subject: C++ fixes
X-Git-Url: https://rtime.felk.cvut.cz/gitweb/frescor/frsh.git/commitdiff_plain/3ff71011c6c65559b1ddc82444a15fc8f566a33d

C++ fixes

C++ compiler failed / generated warnings at these places.
---

diff --git a/fres/contract/fres_contract_type.h b/fres/contract/fres_contract_type.h
index e83ed00..b6a5b33 100644
--- a/fres/contract/fres_contract_type.h
+++ b/fres/contract/fres_contract_type.h
@@ -47,6 +47,10 @@
 #ifndef FRES_CONTRACT_TYPE_H
 #define FRES_CONTRACT_TYPE_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * Data type for represenataion of contract (imcomplete declaration).
  */
@@ -54,4 +58,8 @@ typedef struct fres_contract *fres_contract_ptr;
 
 void fres_contract_ptr_free(fres_contract_ptr contract);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
diff --git a/resources/dummy/res_dummy.h b/resources/dummy/res_dummy.h
index 59439c1..d04a66d 100644
--- a/resources/dummy/res_dummy.h
+++ b/resources/dummy/res_dummy.h
@@ -63,8 +63,8 @@
 #include <fres_contract.h>
 #include <fres_container.h>
 
-#define DUMMY_RESOURCE_TYPE 255
-#define DUMMY_RESOURCE_ID   255
+#define DUMMY_RESOURCE_TYPE (frsh_resource_type_t)255
+#define DUMMY_RESOURCE_ID   (frsh_resource_id_t)255
 
 int fra_dummy_init(void);
 int fres_block_register_dummy(void);