Permalink
Browse files

Get rid of C++ defines

  • Loading branch information...
1 parent feb0018 commit a1682ad43a0901f25750d5de64f0cb95e7863315 @twinaphex twinaphex committed May 16, 2012
Showing with 1 addition and 194 deletions.
  1. +0 −11 libmad/mad.h
  2. +0 −8 libmad/msvc++/mad.h
  3. +0 −3 src/d_items.c
  4. +0 −5 src/d_items.h
  5. +0 −4 src/d_main.h
  6. +0 −6 src/d_net.h
  7. +0 −5 src/d_player.h
  8. +0 −27 src/d_think.h
  9. +0 −4 src/d_ticcmd.h
  10. +0 −3 src/doomstat.c
  11. +0 −4 src/doomstat.h
  12. +0 −3 src/dstrings.c
  13. +0 −4 src/i_system.h
  14. +0 −4 src/i_video.h
  15. +0 −3 src/info.c
  16. +1 −9 src/libretro.h
  17. +0 −3 src/m_bbox.c
  18. +0 −4 src/m_swap.h
  19. +0 −3 src/p_inter.c
  20. +0 −4 src/p_inter.h
  21. +0 −4 src/p_pspr.h
  22. +0 −4 src/p_saveg.h
  23. +0 −4 src/p_setup.h
  24. +0 −4 src/p_tick.h
  25. +0 −4 src/r_bsp.h
  26. +0 −4 src/r_data.h
  27. +0 −4 src/r_defs.h
  28. +0 −4 src/r_draw.h
  29. +0 −4 src/r_main.h
  30. +0 −4 src/r_plane.h
  31. +0 −4 src/r_segs.h
  32. +0 −3 src/r_sky.c
  33. +0 −4 src/r_sky.h
  34. +0 −5 src/r_state.h
  35. +0 −4 src/r_things.h
  36. +0 −4 src/s_sound.h
  37. +0 −3 src/w_memcache.c
  38. +0 −3 src/w_mmap.c
  39. +0 −3 src/w_wad.c
  40. +0 −4 src/w_wad.h
View
@@ -20,19 +20,12 @@
* so by contacting: Underbit Technologies, Inc. <info@underbit.com>
*/
-# ifdef __cplusplus
-extern "C" {
-# endif
-
# define FPM_INTEL
-
-
# define SIZEOF_INT 4
# define SIZEOF_LONG 4
# define SIZEOF_LONG_LONG 8
-
/* Id: version.h,v 1.26 2004/01/23 09:41:33 rob Exp */
# ifndef LIBMAD_VERSION_H
@@ -862,7 +855,3 @@ int mad_decoder_run(struct mad_decoder *, enum mad_decoder_mode);
int mad_decoder_message(struct mad_decoder *, void *, unsigned int *);
# endif
-
-# ifdef __cplusplus
-}
-# endif
View
@@ -20,10 +20,6 @@
* so by contacting: Underbit Technologies, Inc. <info@underbit.com>
*/
-# ifdef __cplusplus
-extern "C" {
-# endif
-
# define FPM_INTEL
@@ -844,7 +840,3 @@ int mad_decoder_run(struct mad_decoder *, enum mad_decoder_mode);
int mad_decoder_message(struct mad_decoder *, void *, unsigned int *);
# endif
-
-# ifdef __cplusplus
-}
-# endif
View
@@ -36,9 +36,6 @@
#include "doomtype.h"
#include "info.h"
-#ifdef __GNUG__
-#pragma implementation "d_items.h"
-#endif
#include "d_items.h"
View
@@ -37,11 +37,6 @@
#include "doomdef.h"
-#ifdef __GNUG__
-#pragma interface
-#endif
-
-
/* Weapon info: sprite frames, ammunition use. */
typedef struct
{
View
@@ -37,10 +37,6 @@
#include "d_event.h"
#include "w_wad.h"
-#ifdef __GNUG__
-#pragma interface
-#endif
-
/* CPhipps - removed wadfiles[] stuff to w_wad.h */
extern char basesavegame[]; // killough 2/16/98: savegame path
View
@@ -37,12 +37,6 @@
#include "d_player.h"
-
-#ifdef __GNUG__
-#pragma interface
-#endif
-
-
//
// Network play related stuff.
// There is a data struct that stores network
View
@@ -52,11 +52,6 @@
// as commands per game tick.
#include "d_ticcmd.h"
-#ifdef __GNUG__
-#pragma interface
-#endif
-
-
//
// Player states.
//
View
@@ -36,34 +36,7 @@
#ifndef __D_THINK__
#define __D_THINK__
-#ifdef __GNUG__
-#pragma interface
-#endif
-
-/*
- * Experimental stuff.
- * To compile this as "ANSI C with classes"
- * we will need to handle the various
- * action functions cleanly.
- */
-// killough 11/98: convert back to C instead of C++
typedef void (*actionf_t)();
-//typedef void (*actionf_v)();
-//typedef void (*actionf_p1)( void* );
-//typedef void (*actionf_p2)( void*, void* );
-
-/* Note: In d_deh.c you will find references to these
- * wherever code pointers and function handlers exist
- */
-/*
-typedef union
-{
- actionf_p1 acp1;
- actionf_v acv;
- actionf_p2 acp2;
-
-} actionf_t;
-*/
/* Historically, "think_t" is yet another
* function pointer to a routine to handle
View
@@ -36,10 +36,6 @@
#include "doomtype.h"
-#ifdef __GNUG__
-#pragma interface
-#endif
-
/* The data sampled per tick (single player)
* and transmitted to other peers (multiplayer).
* Mainly movements/button commands per game tick,
View
@@ -32,9 +32,6 @@
*-----------------------------------------------------------------------------
*/
-#ifdef __GNUG__
-#pragma implementation "doomstat.h"
-#endif
#include "doomstat.h"
// Game Mode - identify IWAD as shareware, retail etc.
View
@@ -42,10 +42,6 @@
// We need the playr data structure as well.
#include "d_player.h"
-#ifdef __GNUG__
-#pragma interface
-#endif
-
// ------------------------
// Command line parameters.
//
View
@@ -32,9 +32,6 @@
*-----------------------------------------------------------------------------
*/
-#ifdef __GNUG__
-#pragma implementation "dstrings.h"
-#endif
#include "dstrings.h"
View
@@ -34,10 +34,6 @@
#ifndef __I_SYSTEM__
#define __I_SYSTEM__
-#ifdef __GNUG__
-#pragma interface
-#endif
-
extern int ms_to_next_tick;
boolean I_StartDisplay(void);
void I_EndDisplay(void);
View
@@ -37,10 +37,6 @@
#include "doomtype.h"
#include "v_video.h"
-#ifdef __GNUG__
-#pragma interface
-#endif
-
void I_PreInitGraphics(void); /* CPhipps - do stuff immediately on start */
void I_SetRes(void); /* set resolution */
void I_InitGraphics (void);
View
@@ -45,9 +45,6 @@
#include "p_pspr.h"
#include "w_wad.h"
-#ifdef __GNUG__
-#pragma implementation "info.h"
-#endif
#include "info.h"
View
@@ -4,10 +4,7 @@
#include <stdint.h>
#include <stddef.h>
-#ifdef __cplusplus
-extern "C" {
-#else
-#if defined(_MSC_VER) && !defined(__cplusplus)
+#if defined(_MSC_VER)
#define bool unsigned char
#define true 1
#define false 0
@@ -16,7 +13,6 @@ extern "C" {
#undef true
#undef false
#endif
-#endif
#define RETRO_API_VERSION 1
@@ -276,8 +272,4 @@ unsigned retro_get_region(void);
void *retro_get_memory_data(unsigned id);
size_t retro_get_memory_size(unsigned id);
-#ifdef __cplusplus
-}
-#endif
-
#endif
View
@@ -34,9 +34,6 @@
*
*-----------------------------------------------------------------------------*/
-#ifdef __GNUG__
-#pragma implementation "m_bbox.h"
-#endif
#include "m_bbox.h"
void M_ClearBox (fixed_t *box)
View
@@ -35,10 +35,6 @@
#ifndef __M_SWAP__
#define __M_SWAP__
-#ifdef __GNUG__
-#pragma interface
-#endif
-
/* CPhipps - now the endianness handling, converting input or output to/from
* the machine's endianness to that wanted for this type of I/O
*
View
@@ -45,9 +45,6 @@
#include "p_inter.h"
#include "p_enemy.h"
-#ifdef __GNUG__
-#pragma implementation "p_inter.h"
-#endif
#include "p_inter.h"
#define BONUSADD 6
View
@@ -37,10 +37,6 @@
#include "d_player.h"
#include "p_mobj.h"
-#ifdef __GNUG__
-#pragma interface
-#endif
-
/* Ty 03/09/98 Moved to an int in p_inter.c for deh and externalization */
#define MAXHEALTH maxhealth
View
@@ -49,10 +49,6 @@
#include "info.h"
-#ifdef __GNUG__
-#pragma interface
-#endif
-
/*
* Frame flags:
* handles maximum brightness (torches, muzzle flare, light sources)
View
@@ -34,10 +34,6 @@
#ifndef __P_SAVEG__
#define __P_SAVEG__
-#ifdef __GNUG__
-#pragma interface
-#endif
-
/* Persistent storage/archiving.
* These are the load / save game routines. */
void P_ArchivePlayers(void);
View
@@ -36,10 +36,6 @@
#include "p_mobj.h"
-#ifdef __GNUG__
-#pragma interface
-#endif
-
void P_SetupLevel(int episode, int map, int playermask, skill_t skill);
void P_Init(void); /* Called by startup code. */
View
@@ -35,10 +35,6 @@
#include "d_think.h"
-#ifdef __GNUG__
-#pragma interface
-#endif
-
/* Called by C_Ticker, can call G_PlayerExited.
* Carries out all thinking of monsters and players. */
View
@@ -34,10 +34,6 @@
#ifndef __R_BSP__
#define __R_BSP__
-#ifdef __GNUG__
-#pragma interface
-#endif
-
extern seg_t *curline;
extern side_t *sidedef;
extern line_t *linedef;
View
@@ -40,10 +40,6 @@
#include "r_state.h"
#include "r_patch.h"
-#ifdef __GNUG__
-#pragma interface
-#endif
-
// A single patch from a texture definition, basically
// a rectangular area within the texture rectangle.
typedef struct
View
@@ -48,10 +48,6 @@
// SECTORS do store MObjs anyway.
#include "p_mobj.h"
-#ifdef __GNUG__
-#pragma interface
-#endif
-
// Silhouette, needed for clipping Segs (mainly)
// and sprites representing things.
#define SIL_NONE 0
View
@@ -36,10 +36,6 @@
#include "r_defs.h"
-#ifdef __GNUG__
-#pragma interface
-#endif
-
enum column_pipeline_e {
RDC_PIPELINE_STANDARD,
RDC_PIPELINE_TRANSLATED,
View
@@ -37,10 +37,6 @@
#include "d_player.h"
#include "r_data.h"
-#ifdef __GNUG__
-#pragma interface
-#endif
-
//
// POV related.
//
View
@@ -36,10 +36,6 @@
#include "r_data.h"
-#ifdef __GNUG__
-#pragma interface
-#endif
-
/* killough 10/98: special mask indicates sky flat comes from sidedef */
#define PL_SKYFLAT (0x80000000)
Oops, something went wrong.

0 comments on commit a1682ad

Please sign in to comment.