diff options
| author | SND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2010-05-08 01:16:38 +0000 |
|---|---|---|
| committer | SND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2010-05-08 01:16:38 +0000 |
| commit | 4d39defcb59600513ff65a688c54f3d6b13ca63a (patch) | |
| tree | c1b89b128f8c7f53a277a8cac28979d02357d083 /libpcsxcore/ix86 | |
| parent | aaaf3199b1afd1e5f88f23ce40305a5df5455599 (diff) | |
| download | pcsxr-4d39defcb59600513ff65a688c54f3d6b13ca63a.tar.gz | |
more cleanups.
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@47580 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'libpcsxcore/ix86')
| -rw-r--r-- | libpcsxcore/ix86/iGte.h | 7 | ||||
| -rw-r--r-- | libpcsxcore/ix86/ix86.c | 4 | ||||
| -rw-r--r-- | libpcsxcore/ix86/ix86.h | 15 |
3 files changed, 22 insertions, 4 deletions
diff --git a/libpcsxcore/ix86/iGte.h b/libpcsxcore/ix86/iGte.h index 0847e368..d03705ec 100644 --- a/libpcsxcore/ix86/iGte.h +++ b/libpcsxcore/ix86/iGte.h @@ -20,6 +20,10 @@ #ifndef __IGTE_H__ #define __IGTE_H__ +#ifdef __cplusplus +extern "C" { +#endif + #include "../r3000a.h" #include "../psxmem.h" @@ -69,4 +73,7 @@ CP2_FUNC(GPF); CP2_FUNC(GPL); CP2_FUNCNC(NCCT); +#ifdef __cplusplus +} +#endif #endif diff --git a/libpcsxcore/ix86/ix86.c b/libpcsxcore/ix86/ix86.c index 763552e8..d701e899 100644 --- a/libpcsxcore/ix86/ix86.c +++ b/libpcsxcore/ix86/ix86.c @@ -25,6 +25,10 @@ #include "ix86.h" +s8 *x86Ptr; +u8 *j8Ptr[32]; +u32 *j32Ptr[32]; + void x86Init() { } diff --git a/libpcsxcore/ix86/ix86.h b/libpcsxcore/ix86/ix86.h index 3ace6122..2b60dfff 100644 --- a/libpcsxcore/ix86/ix86.h +++ b/libpcsxcore/ix86/ix86.h @@ -26,6 +26,10 @@ #ifndef __IX86_H__ #define __IX86_H__ +#ifdef __cplusplus +extern "C" { +#endif + // include basic types #include "../psxcommon.h" #include "../r3000a.h" @@ -93,9 +97,9 @@ #define XMM6 6 #define XMM7 7 -s8 *x86Ptr; -u8 *j8Ptr[32]; -u32 *j32Ptr[32]; +extern s8 *x86Ptr; +extern u8 *j8Ptr[32]; +extern u32 *j32Ptr[32]; void x86Init(); void x86SetPtr(char *ptr); @@ -663,4 +667,7 @@ void XORPSRtoR(int to,int from); void ANDPSMtoR(int to,int from); void ANDPSRtoR(int to,int from); -#endif /* __IX86_H__ */ +#ifdef __cplusplus +} +#endif +#endif |