Merge pull request #10 from aredlich/master

Please pull from my fork of libiscsi

include/iscsi-private.h

@@ -24,6 +24,10 @@
 #define ssize_t SSIZE_T
 #endif
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #ifndef discard_const
 #define discard_const(ptr) ((void *)((intptr_t)(ptr)))
 #endif
@@ -267,5 +271,9 @@ struct scsi_task *iscsi_scsi_get_task_from_pdu(struct iscsi_pdu *pdu);
 
 int iscsi_reconnect(struct iscsi_context *iscsi);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __iscsi_private_h__ */
 

include/iscsi.h

@@ -25,6 +25,10 @@
 #define EXTERN
 #endif
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct iscsi_context;
 struct sockaddr;
 
@@ -839,4 +843,8 @@ iscsi_scsi_task_cancel(struct iscsi_context *iscsi,
 EXTERN void
 iscsi_scsi_cancel_all_tasks(struct iscsi_context *iscsi);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __iscsi_h__ */

include/scsi-lowlevel.h

@@ -17,6 +17,10 @@
 #ifndef __scsi_lowlevel_h__
 #define __scsi_lowlevel_h__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define SCSI_CDB_MAX_SIZE			16
 
 enum scsi_opcode {
@@ -639,5 +643,9 @@ EXTERN struct scsi_task *scsi_cdb_prefetch16(uint64_t lba, int num_blocks, int i
 
 void *scsi_malloc(struct scsi_task *task, size_t size);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __scsi_lowlevel_h__ */
 

include/slist.h

@@ -15,6 +15,9 @@
    along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 
+#ifndef __iscsi_slist_h__
+#define __iscsi_slist_h__
+
 #define SLIST_ADD(list, item) \
 	do {							\
 		(item)->next = (*list);				\
@@ -46,6 +49,4 @@
 	   (*list) = head;					\
 	}
 
-
+#endif /* __iscsi_slist_h__ */
-
-