Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/game/Buzz_inc.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/

#ifndef __BUZZ_INC_H__
#define __BUZZ_INC_H__ 1
#ifndef RIS_BUZZ_INC_H
#define RIS_BUZZ_INC_H 1

extern "C" {
int game_main(int argc, char *argv[]);
Expand Down Expand Up @@ -77,4 +77,4 @@ extern "C" {
#include "macros.h" // Collected Macros
#include "fs.h"

#endif /* __BUZZ_INC_H__ */
#endif // RIS_BUZZ_INC_H
6 changes: 3 additions & 3 deletions src/game/data.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef __DATA_H__
#define __DATA_H__
#ifndef RIS_DATA_H
#define RIS_DATA_H

#include <stdint.h>

Expand Down Expand Up @@ -845,6 +845,6 @@ BOOST_STATIC_ASSERT(sizeof(BuzzData) == 15520);
BOOST_STATIC_ASSERT(sizeof(MisEval) == 40);
BOOST_STATIC_ASSERT(sizeof(Players) == 38866);

#endif // __DATA_H__
#endif // RIS_DATA_H

/* vim: set noet ts=4 sw=4 tw=77: */
8 changes: 3 additions & 5 deletions src/game/macros.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@

#ifndef __MACROS_H__
#define __MACROS_H__
#ifndef RIS_MACROS_H
#define RIS_MACROS_H

#define ARRAY_LENGTH(arr) ((sizeof (arr)) / (sizeof ((arr)[0])))

Expand Down Expand Up @@ -41,5 +40,4 @@
#define IsHumanPlayer(a) ( (plr[(a)]==0 || plr[(a)]==1) )


#endif

#endif // RIS_MACROS_H
6 changes: 3 additions & 3 deletions src/game/pace.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef __PACE_H__
#define __PACE_H__
#ifndef RIS_PACE_H
#define RIS_PACE_H

#include <SDL/SDL.h>

Expand Down Expand Up @@ -42,4 +42,4 @@ extern int show_intro_flag;
extern char *letter_dat;


#endif /* __PACE_H__ */
#endif // RIS_PACE_H