Add header guards

25 files changed, 119 insertions, 1 deletions

diff --git a/plugins/cdrcimg/cdrcimg.h b/plugins/cdrcimg/cdrcimg.h
index efeaaf9..0c6d001 100644
--- a/plugins/cdrcimg/cdrcimg.h
+++ b/plugins/cdrcimg/cdrcimg.h
@@ -1,3 +1,7 @@
+#ifndef __P_CDRCIMG_H__
+#define __P_CDRCIMG_H__
 
 void  cdrcimg_set_fname(const char *fname);
 void *cdrcimg_get_sym(const char *sym);
+
+#endif /* __P_CDRCIMG_H__ */
diff --git a/plugins/dfinput/externals.h b/plugins/dfinput/externals.h
index a446956..2e216fd 100644
--- a/plugins/dfinput/externals.h
+++ b/plugins/dfinput/externals.h
@@ -1,3 +1,5 @@
+#ifndef __P_EXTERNALS_H__
+#define __P_EXTERNALS_H__
 
 void dfinput_activate(void);
 
@@ -12,3 +14,5 @@ extern void pl_update_gun(int *xn, int *yn, int *xres, int *yres, int *in);
 /* vibration trigger to frontend */
 extern int in_enable_vibration;
 extern void plat_trigger_vibrate(int pad, int low, int high);
+
+#endif /* __P_EXTERNALS_H__ */
diff --git a/plugins/dfinput/main.h b/plugins/dfinput/main.h
index e83306a..96cebfa 100644
--- a/plugins/dfinput/main.h
+++ b/plugins/dfinput/main.h
@@ -1,3 +1,6 @@
+#ifndef __P_MAIN_H__
+#define __P_MAIN_H__
+
 #include "psemu_plugin_defs.h"
 #include "externals.h"
 
@@ -16,3 +19,5 @@ void guncon_init(void);
 /* get button state and pad type from main emu */
 extern long (*PAD1_readPort1)(PadDataS *pad);
 extern long (*PAD2_readPort2)(PadDataS *pad);
+
+#endif /* __P_MAIN_H__ */
diff --git a/plugins/dfsound/adsr.h b/plugins/dfsound/adsr.h
index ff2af1f..2374f41 100644
--- a/plugins/dfsound/adsr.h
+++ b/plugins/dfsound/adsr.h
@@ -15,5 +15,10 @@
  *                                                                         *

  ***************************************************************************/

 

+#ifndef __P_ADER_H__

+#define __P_ADER_H__

+

 INLINE void StartADSR(int ch);

 INLINE int  MixADSR(int ch);

+

+#endif /* __P_ADER_H__ */

diff --git a/plugins/dfsound/dma.h b/plugins/dfsound/dma.h
index 440536f..4982432 100644
--- a/plugins/dfsound/dma.h
+++ b/plugins/dfsound/dma.h
@@ -24,8 +24,12 @@
 //

 //*************************************************************************//

 

+#ifndef __P_DMA_H__

+#define __P_DMA_H__

 

 unsigned short CALLBACK SPUreadDMA(void);

 void CALLBACK SPUreadDMAMem(unsigned short * pusPSXMem,int iSize);

 void CALLBACK SPUwriteDMA(unsigned short val);

 void CALLBACK SPUwriteDMAMem(unsigned short * pusPSXMem,int iSize);

+

+#endif /* __P_DMA_H__ */

diff --git a/plugins/dfsound/externals.h b/plugins/dfsound/externals.h
index 2db75ac..4fb3b93 100644
--- a/plugins/dfsound/externals.h
+++ b/plugins/dfsound/externals.h
@@ -15,6 +15,9 @@
  *                                                                         *

  ***************************************************************************/

 

+#ifndef __P_SOUND_EXTERNALS_H__

+#define __P_SOUND_EXTERNALS_H__

+

 #include <stdint.h>

 

 /////////////////////////////////////////////////////////

@@ -254,3 +257,4 @@ void schedule_next_irq(void);
 

 #endif

 

+#endif /* __P_SOUND_EXTERNALS_H__ */

diff --git a/plugins/dfsound/out.h b/plugins/dfsound/out.h
index 4607099..e4878a8 100644
--- a/plugins/dfsound/out.h
+++ b/plugins/dfsound/out.h
@@ -1,3 +1,5 @@
+#ifndef __P_OUT_H__
+#define __P_OUT_H__
 
 struct out_driver {
 	const char *name;
@@ -10,3 +12,5 @@ struct out_driver {
 extern struct out_driver *out_current;
 
 void SetupSound(void);
+
+#endif /* __P_OUT_H__ */
diff --git a/plugins/dfsound/registers.h b/plugins/dfsound/registers.h
index 3bca518..28641b8 100644
--- a/plugins/dfsound/registers.h
+++ b/plugins/dfsound/registers.h
@@ -15,6 +15,9 @@
  *                                                                         *

  ***************************************************************************/

 

+#ifndef __P_REGISTERS_H__

+#define __P_REGISTERS_H__

+

 #define H_SPUReverbAddr  0x0da2

 #define H_SPUirqAddr     0x0da4

 #define H_SPUaddr        0x0da6

@@ -154,3 +157,4 @@
 

 void CALLBACK SPUwriteRegister(unsigned long reg, unsigned short val, unsigned int cycles);

 

+#endif /* __P_REGISTERS_H__ */

diff --git a/plugins/dfsound/spu.h b/plugins/dfsound/spu.h
index d42425d..23425d9 100644
--- a/plugins/dfsound/spu.h
+++ b/plugins/dfsound/spu.h
@@ -15,6 +15,11 @@
  *                                                                         *

  ***************************************************************************/

 

+#ifndef __P_SPU_H__

+#define __P_SPU_H__

+

 void ClearWorkingState(void);

 void CALLBACK SPUplayADPCMchannel(xa_decode_t *xap);

 int  CALLBACK SPUplayCDDAchannel(short *pcm, int bytes);

+

+#endif /* __P_SPU_H__ */

diff --git a/plugins/dfsound/spu_c64x.h b/plugins/dfsound/spu_c64x.h
index 7c4d565..56ede38 100644
--- a/plugins/dfsound/spu_c64x.h
+++ b/plugins/dfsound/spu_c64x.h
@@ -1,3 +1,6 @@
+#ifndef __P_SPU_C64X_H__
+#define __P_SPU_C64X_H__
+
 #define COMPONENT_NAME "pcsxr_spu"
 
 enum {
@@ -26,3 +29,5 @@ struct region_mem {
 };
 
 #define ACTIVE_CNT 3
+
+#endif /* __P_SPU_C64X_H__ */
diff --git a/plugins/dfsound/spu_config.h b/plugins/dfsound/spu_config.h
index 6b46bf3..28965ab 100644
--- a/plugins/dfsound/spu_config.h
+++ b/plugins/dfsound/spu_config.h
@@ -1,3 +1,6 @@
+#ifndef __P_SPU_CONFIG_H__
+#define __P_SPU_CONFIG_H__
+
 // user settings
 
 typedef struct
@@ -16,3 +19,5 @@ typedef struct
 } SPUConfig;
 
 extern SPUConfig spu_config;
+
+#endif /* __P_SPU_CONFIG_H__ */
diff --git a/plugins/dfsound/stdafx.h b/plugins/dfsound/stdafx.h
index 7e22029..04aa233 100644
--- a/plugins/dfsound/stdafx.h
+++ b/plugins/dfsound/stdafx.h
@@ -15,6 +15,9 @@
  *                                                                         *
  ***************************************************************************/
 
+#ifndef __P_STDAFX_H__
+#define __P_STDAFX_H__
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h> 
@@ -35,3 +38,5 @@
 #endif
 
 #include "psemuxa.h"
+
+#endif /* __P_STDAFX_H__ */
diff --git a/plugins/dfsound/xa.h b/plugins/dfsound/xa.h
index cbf2843..137fe43 100644
--- a/plugins/dfsound/xa.h
+++ b/plugins/dfsound/xa.h
@@ -15,6 +15,11 @@
  *                                                                         *

  ***************************************************************************/

 

+#ifndef __P_XA_H__

+#define __P_XA_H__

+

 INLINE void MixXA(void);

 INLINE void FeedXA(xa_decode_t *xap);

-INLINE int  FeedCDDA(unsigned char *pcm, int nBytes);
+INLINE int  FeedCDDA(unsigned char *pcm, int nBytes);

+

+#endif /* __P_XA_H__ */

diff --git a/plugins/gpu_neon/psx_gpu/psx_gpu_offsets.h b/plugins/gpu_neon/psx_gpu/psx_gpu_offsets.h
index 5460e40..161384e 100644
--- a/plugins/gpu_neon/psx_gpu/psx_gpu_offsets.h
+++ b/plugins/gpu_neon/psx_gpu/psx_gpu_offsets.h
@@ -1,3 +1,6 @@
+#ifndef __P_PSX_GPU_OFFSETS_H__
+#define __P_PSX_GPU_OFFSETS_H__
+
 #define psx_gpu_test_mask_offset                          0x0
 #define psx_gpu_uvrg_offset                               0x10
 #define psx_gpu_uvrg_dx_offset                            0x20
@@ -56,3 +59,5 @@
 #define psx_gpu_texture_4bpp_cache_offset                 0x5a00
 #define psx_gpu_texture_8bpp_even_cache_offset            0x205a00
 #define psx_gpu_texture_8bpp_odd_cache_offset             0x305a00
+
+#endif /* __P_PSX_GPU_OFFSETS_H__ */
diff --git a/plugins/gpu_unai/gpu_arm.h b/plugins/gpu_unai/gpu_arm.h
index a0b2248..b9f8f97 100644
--- a/plugins/gpu_unai/gpu_arm.h
+++ b/plugins/gpu_unai/gpu_arm.h
@@ -1,3 +1,6 @@
+#ifndef __GPU_UNAI_GPU_ARM_H__
+#define __GPU_UNAI_GPU_ARM_H__
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -7,3 +10,5 @@ void draw_spr16_full(u16 *d, void *s, u16 *pal, int lines);
 #ifdef __cplusplus
 }
 #endif
+
+#endif /* __GPU_UNAI_GPU_ARM_H__ */
diff --git a/plugins/gpu_unai/gpu_command.h b/plugins/gpu_unai/gpu_command.h
index 7096b75..c39c81b 100644
--- a/plugins/gpu_unai/gpu_command.h
+++ b/plugins/gpu_unai/gpu_command.h
@@ -19,6 +19,9 @@
 *   51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA.           *
 ***************************************************************************/
 
+#ifndef __GPU_UNAI_GPU_COMMAND_H__
+#define __GPU_UNAI_GPU_COMMAND_H__
+
 ///////////////////////////////////////////////////////////////////////////////
 void gpuSetTexture(u16 tpage)
 {
@@ -614,3 +617,5 @@ void gpuSendPacketFunction(const int PRIM)
 ///////////////////////////////////////////////////////////////////////////////
 // End of code specific to non-gpulib standalone version of gpu_unai
 ///////////////////////////////////////////////////////////////////////////////
+
+#endif /* __GPU_UNAI_GPU_COMMAND_H__ */
diff --git a/plugins/gpu_unai/gpu_inner.h b/plugins/gpu_unai/gpu_inner.h
index 76479f9..4aab604 100644
--- a/plugins/gpu_unai/gpu_inner.h
+++ b/plugins/gpu_unai/gpu_inner.h
@@ -19,6 +19,9 @@
 *   51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA.           *
 ***************************************************************************/
 
+#ifndef __GPU_UNAI_GPU_INNER_H__
+#define __GPU_UNAI_GPU_INNER_H__
+
 ///////////////////////////////////////////////////////////////////////////////
 // Inner loop driver instantiation file
 
@@ -727,3 +730,5 @@ const PP gpuPolySpanDrivers[2048] = {
 #undef TI
 #undef TN
 #undef TIBLOCK
+
+#endif /* __GPU_UNAI_GPU_INNER_H__ */
diff --git a/plugins/gpu_unai/gpu_raster_image.h b/plugins/gpu_unai/gpu_raster_image.h
index 87d2151..2d34b34 100644
--- a/plugins/gpu_unai/gpu_raster_image.h
+++ b/plugins/gpu_unai/gpu_raster_image.h
@@ -18,6 +18,9 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA.           *
  ***************************************************************************/
 
+#ifndef __GPU_UNAI_GPU_RASTER_IMAGE_H__
+#define __GPU_UNAI_GPU_RASTER_IMAGE_H__
+
 ///////////////////////////////////////////////////////////////////////////////
 #ifndef USE_GPULIB
 void gpuLoadImage(PtrUnion packet)
@@ -213,3 +216,5 @@ void gpuClearImage(PtrUnion packet)
 		}
 	}
 }
+
+#endif /* __GPU_UNAI_GPU_RASTER_IMAGE_H__ */
diff --git a/plugins/gpu_unai/gpu_raster_line.h b/plugins/gpu_unai/gpu_raster_line.h
index 28ea074..2a7b422 100644
--- a/plugins/gpu_unai/gpu_raster_line.h
+++ b/plugins/gpu_unai/gpu_raster_line.h
@@ -19,6 +19,9 @@
 *   51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA.           *
 ***************************************************************************/
 
+#ifndef __GPU_UNAI_GPU_RASTER_LINE_H__
+#define __GPU_UNAI_GPU_RASTER_LINE_H__
+
 ///////////////////////////////////////////////////////////////////////////////
 //  GPU internal line drawing functions
 //
@@ -713,3 +716,5 @@ void gpuDrawLineG(PtrUnion packet, const PSD gpuPixelSpanDriver)
 	// Final run of pixels
 	gpuPixelSpanDriver(dst, (uintptr_t)&gcol, incr_major, end_length);
 }
+
+#endif /* __GPU_UNAI_GPU_RASTER_LINE_H__ */
diff --git a/plugins/gpu_unai/gpu_raster_polygon.h b/plugins/gpu_unai/gpu_raster_polygon.h
index f66a9e2..b30286d 100644
--- a/plugins/gpu_unai/gpu_raster_polygon.h
+++ b/plugins/gpu_unai/gpu_raster_polygon.h
@@ -18,6 +18,9 @@
 *   51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA.           *
 ***************************************************************************/
 
+#ifndef __GPU_UNAI_GPU_RASTER_POLYGON_H__
+#define __GPU_UNAI_GPU_RASTER_POLYGON_H__
+
 //senquack - NOTE: GPU Unai poly routines have been rewritten/adapted
 // from DrHell routines to fix multiple issues. See README_senquack.txt
 
@@ -1446,3 +1449,5 @@ void gpuDrawPolyGT(const PtrUnion packet, const PP gpuPolySpanDriver, u32 is_qua
 		}
 	} while (++cur_pass < total_passes);
 }
+
+#endif /* __GPU_UNAI_GPU_RASTER_POLYGON_H__ */
diff --git a/plugins/gpu_unai/gpu_raster_sprite.h b/plugins/gpu_unai/gpu_raster_sprite.h
index 0afdbf5..91f7bc0 100644
--- a/plugins/gpu_unai/gpu_raster_sprite.h
+++ b/plugins/gpu_unai/gpu_raster_sprite.h
@@ -18,6 +18,9 @@
 *   51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA.           *
 ***************************************************************************/
 
+#ifndef __GPU_UNAI_GPU_RASTER_SPRITE_H__
+#define __GPU_UNAI_GPU_RASTER_SPRITE_H__
+
 ///////////////////////////////////////////////////////////////////////////////
 //  GPU internal sprite drawing functions
 
@@ -163,3 +166,5 @@ void gpuDrawT(PtrUnion packet, const PT gpuTileSpanDriver)
 		Pixel += FRAME_WIDTH;
 	}
 }
+
+#endif /* __GPU_UNAI_GPU_RASTER_SPRITE_H__ */
diff --git a/plugins/gpu_unai/port.h b/plugins/gpu_unai/port.h
index 238b98b..0a731f8 100644
--- a/plugins/gpu_unai/port.h
+++ b/plugins/gpu_unai/port.h
@@ -1,3 +1,6 @@
+#ifndef __GPU_UNAI_GPU_PORT_H__
+#define __GPU_UNAI_GPU_PORT_H__
+
 #include <stddef.h>
 #include <string.h>
 
@@ -34,3 +37,5 @@ void GPUwriteStatus(u32 data);
 #undef s32
 
 }
+
+#endif /* __GPU_UNAI_GPU_PORT_H__ */
diff --git a/plugins/gpu_unai/profiler.h b/plugins/gpu_unai/profiler.h
index c09c95f..a23ee38 100644
--- a/plugins/gpu_unai/profiler.h
+++ b/plugins/gpu_unai/profiler.h
@@ -1,4 +1,9 @@
+#ifndef __GPU_UNAI_GPU_PROFILER_H__
+#define __GPU_UNAI_GPU_PROFILER_H__
+
 #define pcsx4all_prof_pause(...)
 #define pcsx4all_prof_start_with_pause(...)
 #define pcsx4all_prof_end_with_resume(...)
 #define pcsx4all_prof_resume(...)
+
+#endif /* __GPU_UNAI_GPU_PROFILER_H__ */
diff --git a/plugins/gpulib/gpu.h b/plugins/gpulib/gpu.h
index 7e1d18b..36de7ee 100644
--- a/plugins/gpulib/gpu.h
+++ b/plugins/gpulib/gpu.h
@@ -8,6 +8,9 @@
  * See the COPYING file in the top-level directory.
  */
 
+#ifndef __GPULIB_GPU_H__
+#define __GPULIB_GPU_H__
+
 #include <stdint.h>
 
 #ifdef __cplusplus
@@ -140,3 +143,5 @@ void GPUrearmedCallbacks(const struct rearmed_cbs *cbs_);
 #ifdef __cplusplus
 }
 #endif
+
+#endif /* __GPULIB_GPU_H__ */
diff --git a/plugins/spunull/register.h b/plugins/spunull/register.h
index 52128b7..2e0b892 100644
--- a/plugins/spunull/register.h
+++ b/plugins/spunull/register.h
@@ -1,3 +1,6 @@
+#ifndef __SPUNULL_REGISTER_H__

+#define __SPUNULL_REGISTER_H__

+

 #define H_SPUirqAddr     0x0da4

 #define H_SPUaddr        0x0da6

 #define H_SPUdata        0x0da8

@@ -119,3 +122,4 @@
 #define H_SPU_ADSRLevel22  0x0d68

 #define H_SPU_ADSRLevel23  0x0d78

 

+#endif /* __SPUNULL_REGISTER_H__ */