Merge pull request #500 from Ziemas/iop-cpp

Add extern "C" to IOP headers for C++ support.

Author: uyjulian

iop/kernel/include/cdvdfsv.h

@@ -19,11 +19,19 @@
 #include <types.h>
 #include <irx.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 int sceCdChangeThreadPriority(int priority);
 
 #define cdvdfsv_IMPORTS_start DECLARE_IMPORT_TABLE(cdvdfsv, 1, 1)
 #define cdvdfsv_IMPORTS_end END_IMPORT_TABLE
 
 #define I_sceCdChangeThreadPriority DECLARE_IMPORT(5, sceCdChangeThreadPriority)
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __CDVDFSV_H__ */

iop/kernel/include/cdvdman.h

@@ -21,6 +21,10 @@
 
 #include <libcdvd-common.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 //IOP-only libcdvd function prototypes.
 int sceCdCheckCmd(void);
 int sceCdNop(void);
@@ -175,4 +179,8 @@ int sceCdReadDiskID(unsigned int *id);
 #define I_sceCdReadRegionParams DECLARE_IMPORT(189, sceCdReadRegionParams)
 #define I_sceCdWriteRegionParams DECLARE_IMPORT(191, sceCdWriteRegionParams)
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __CDVDMAN_H__ */

iop/kernel/include/ctype.h

@@ -16,6 +16,10 @@
 #ifndef __CTYPE_H__
 #define __CTYPE_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define isascii(c)	((unsigned int)(c) <= 127)
 #define toascii(c)	((unsigned char)(c) & 127)
 
@@ -87,4 +91,8 @@
 
 #endif
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __CTYPE_H__ */

iop/kernel/include/defs.h

@@ -18,6 +18,10 @@
 
 #include <types.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #ifndef NULL
 #define NULL	((void *)0)
 #endif
@@ -84,4 +88,8 @@ static inline void *iop_memcpy(void *dest, const void *src, int size)
 	return dest;
 }
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __DEFS_H__ */

iop/kernel/include/dmacman.h

@@ -19,6 +19,10 @@
 #include <types.h>
 #include <irx.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef struct _iop_dmac_chan {
 	u32	madr;
 	u32	bcr;
@@ -166,4 +170,8 @@ void dmac_disable(u32 channel);	//sceDisableDMAChannel
 #define I_dmac_enable DECLARE_IMPORT(34, dmac_enable)
 #define I_dmac_disable DECLARE_IMPORT(35, dmac_disable)
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __DMACMAN_H__ */

iop/kernel/include/excepman.h

@@ -19,6 +19,10 @@
 #include <types.h>
 #include <irx.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* From any r3000's cop0 documentation */
 /** External Interrupt */
 #define IOP_EXCEPTION_INT	0
@@ -81,4 +85,8 @@ int ReleaseDefaultExceptionHandler(exception_handler_t);
 #define I_ReleaseExceptionHandler DECLARE_IMPORT(7, ReleaseExceptionHandler)
 #define I_ReleaseDefaultExceptionHandler DECLARE_IMPORT(8, ReleaseDefaultExceptionHandler)
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __EXCEPMAN_H__ */

iop/kernel/include/heaplib.h

@@ -19,6 +19,10 @@
 #include <types.h>
 #include <irx.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 void *CreateHeap(int heapblocksize, int flag);
 void DeleteHeap(void *heap);
 void *AllocHeapMemory(void *heap, size_t nbytes);
@@ -39,4 +43,8 @@ int HeapChunkSize(void* chunk);
 #define I_HeapPrepare DECLARE_IMPORT(11, HeapPrepare)
 #define I_HeapChunkSize DECLARE_IMPORT(15, HeapChunkSize)
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __HEAPLIB_H__ */

iop/kernel/include/intrman.h

@@ -19,6 +19,10 @@
 #include <types.h>
 #include <irx.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 enum iop_irq_list {
     IOP_IRQ_VBLANK = 0,
     /** INUM_GM */
@@ -222,4 +226,8 @@ int SetShouldPreemptCb(void *cb);
 #define I_SetNewCtxCb         DECLARE_IMPORT(28, SetNewCtxCb)
 #define I_SetShouldPreemptCb  DECLARE_IMPORT(30, SetShouldPreemptCb)
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __INTRMAN_H__ */

iop/kernel/include/ioman.h

@@ -20,6 +20,10 @@
 #include <irx.h>
 #include <io_common.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 int open(const char *name, int mode);
 int close(int fd);
 int read(int fd, void *ptr, size_t size);
@@ -110,4 +114,8 @@ int DelDrv(const char *name);
 #define I_AddDrv DECLARE_IMPORT(20, AddDrv);
 #define I_DelDrv DECLARE_IMPORT(21, DelDrv);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __IOMAN_H__ */

iop/kernel/include/iomanX.h

@@ -24,6 +24,10 @@
 #include <io_common.h>
 #include <iox_stat.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 // Rename prototype names in order to avoid clashes with other standard I/O libraries.
 #ifndef IOMANX_OLD_NAME_COMPATIBILITY
 #ifdef _IOP
@@ -379,4 +383,8 @@ static inline void StdioInit(int mode)
 
 #endif /* IOMANX_OLD_NAME_COMPATIBILITY */
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __IOMANX_H__ */