Make header protection consistent

And delete a couple of useless files.
This commit is contained in:
Bill Currie 2020-02-24 12:21:20 +09:00
parent 7406e0308e
commit a30433fa9e
57 changed files with 162 additions and 254 deletions

View file

@ -2,14 +2,14 @@ AUTOMAKE_OPTIONS = foreign
pkgincludedir = $(includedir)/QF
nobase_pkginclude_HEADERS = \
alloc.h bspfile.h cbuf.h cdaudio.h checksum.h clip_hull.h cmd.h \
console.h crc.h csqc.h cvar.h dstring.h draw.h gib.h hash.h hl.h \
console.h crc.h csqc.h cvar.h dstring.h draw.h gib.h hash.h \
idparse.h image.h in_event.h info.h input.h iqm.h joystick.h keys.h \
link.h llist.h locs.h mathlib.h mdfour.h mersenne.h model.h modelgen.h \
msg.h object.h pak.h pakfile.h pcx.h png.h plugin.h pr_comp.h pr_debug.h \
pr_obj.h pr_type.h progs.h qargs.h qdefs.h qendian.h qfplist.h qtypes.h \
quakefs.h \
quakeio.h render.h riff.h ruamoko.h screen.h script.h segtext.h set.h \
sizebuf.h skin.h sound.h spritegn.h sys.h teamplay.h tga.h uint32.h va.h \
sizebuf.h skin.h sound.h spritegn.h sys.h teamplay.h tga.h va.h \
ver_check.h vid.h vrect.h view.h wad.h wadfile.h winding.h zone.h \
\
GL/ati.h GL/defines.h GL/extensions.h GL/funcs.h GL/qf_draw.h \

View file

@ -24,8 +24,8 @@
Boston, MA 02111-1307, USA
*/
#ifndef __bspfile_h_
#define __bspfile_h_
#ifndef __QF_bspfile_h
#define __QF_bspfile_h
#include "QF/qtypes.h"
#include "QF/quakeio.h"
@ -310,4 +310,4 @@ void BSP_AddVisibility (bsp_t *bsp, const byte *visdata, size_t visdatasize);
void BSP_AddEntities (bsp_t *bsp, const char *entdata, size_t entdatasize);
void BSP_AddTextures (bsp_t *bsp, const byte *texdata, size_t texdatasize);
#endif//__bspfile_h_
#endif//__QF_bspfile_h

View file

@ -25,8 +25,8 @@
*/
#ifndef _CDAUDIO_H
#define _CDAUDIO_H
#ifndef __QF_cdaudio_h
#define __QF_cdaudio_h
#include "QF/qtypes.h"
@ -38,4 +38,4 @@ void CDAudio_Resume(void);
void CDAudio_Shutdown(void);
void CDAudio_Update(void);
#endif // _CDAUDIO_H
#endif//__QF_cdaudio_h

View file

@ -25,8 +25,8 @@
*/
#ifndef __checksum_h
#define __checksum_h
#ifndef __QF_checksum_h
#define __QF_checksum_h
/** \addtogroup crc
*/
@ -40,4 +40,4 @@ byte COM_BlockSequenceCRCByte (const byte *base, int length, int sequence);
///@}
#endif // __checksum_h
#endif//__QF_checksum_h

View file

@ -25,8 +25,8 @@
*/
#ifndef __console_h
#define __console_h
#ifndef __QF_console_h
#define __QF_console_h
#include <stdarg.h>
@ -151,4 +151,4 @@ void Menu_Leave_f (void);
void Menu_Prev_f (void);
void Menu_Next_f (void);
#endif // __console_h
#endif//__QF_console_h

View file

@ -25,8 +25,8 @@
*/
#ifndef __crc_h
#define __crc_h
#ifndef __QF_crc_h
#define __QF_crc_h
/** \defgroup crc Checksum generation.
\ingroup utils
@ -43,4 +43,4 @@ unsigned short CRC_Block (const byte *start, int count) __attribute__((pure));
///@}
#endif // __crc_h
#endif//__QF_crc_h

View file

@ -25,8 +25,8 @@
*/
#ifndef __cvar_h
#define __cvar_h
#ifndef __QF_cvar_h
#define __QF_cvar_h
/** \defgroup cvar Configuration variables
\ingroup utils
@ -140,4 +140,4 @@ extern cvar_t *cvar_vars;
///@}
#endif // __cvar_h
#endif//__QF_cvar_h

View file

@ -25,8 +25,8 @@
*/
#ifndef _DRAW_H
#define _DRAW_H
#ifndef __QF_draw_h
#define __QF_draw_h
/** \defgroup video Video Sub-sytem */
@ -234,4 +234,4 @@ void Draw_Picf (float x, float y, qpic_t *pic);
void Draw_SubPic(int x, int y, qpic_t *pic, int srcx, int srcy, int width, int height);
///@}
#endif // _DRAW_H
#endif//__QF_draw_h

View file

@ -25,8 +25,8 @@
*/
#ifndef __dstring_h
#define __dstring_h
#ifndef __QF_dstring_h
#define __QF_dstring_h
/** \defgroup dstring Dynamic Strings
\ingroup utils
@ -177,4 +177,4 @@ int dasprintf (dstring_t *dstr, const char *fmt, ...) __attribute__((format(prin
///@}
#endif // __dstring_h
#endif//__QF_dstring_h

View file

@ -28,8 +28,8 @@
*/
#ifndef __gib_h
#define __gib_h
#ifndef __QF_gib_h
#define __QF_gib_h
// Dependencies
@ -216,4 +216,4 @@ unsigned long int GIB_Handle_New (gib_object_t *data);
void GIB_Handle_Free (unsigned long int num);
gib_object_t *GIB_Handle_Get (unsigned long int num) __attribute__((pure));
#endif
#endif//__QF_gib_h

View file

@ -25,8 +25,8 @@
*/
#ifndef __hash_h
#define __hash_h
#ifndef __QF_hash_h
#define __QF_hash_h
#include <stdint.h>
#include <stdlib.h>
@ -211,4 +211,4 @@ void Hash_Stats (hashtab_t *tab);
///@}
#endif // __hash_h
#endif//__QF_hash_h

View file

@ -1,40 +0,0 @@
/*
hl_bsp.h
Half Life file definitions
Copyright (C) 1996-1997 Id Software, Inc.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to:
Free Software Foundation, Inc.
59 Temple Place - Suite 330
Boston, MA 02111-1307, USA
*/
#ifndef _HL_BSP_H
#define _HL_BSP_H
#include "QF/qtypes.h"
extern void CL_ParseEntityLump(const char *entdata);
extern void HL_Mod_LoadLighting (lump_t *l);
extern void HL_Mod_LoadTextures (lump_t *l);
extern byte *W_GetTexture(const char *name, int matchwidth, int matchheight);
extern void W_LoadTextureWadFile (const char *filename, int complain);
#endif // _HL_BSP_H

View file

@ -49,4 +49,4 @@ typedef struct tex_s {
tex_t *LoadImage (const char *imageFile);
#endif //__QF_image_h
#endif//__QF_image_h

View file

@ -25,8 +25,8 @@
*/
#ifndef _INFO_H
#define _INFO_H
#ifndef __QF_info_h
#define __QF_info_h
/** \defgroup info Info Keys
\ingroup utils
@ -65,4 +65,4 @@ void Info_AddKeys (info_t *info, info_t *keys);
///@}
#endif // _INFO_H
#endif//__QF_info_h

View file

@ -25,8 +25,8 @@
*/
#ifndef __QF_input_h_
#define __QF_input_h_
#ifndef __QF_input_h
#define __QF_input_h
#include "QF/keys.h"
@ -75,4 +75,4 @@ void IN_LL_Grab_Input (int grab);
extern kbutton_t in_strafe, in_klook, in_speed, in_mlook;
#endif // __QF_input_h_
#endif//__QF_input_h

View file

@ -1,5 +1,5 @@
#ifndef __QF_iqm_h__
#define __QF_iqm_h__
#ifndef __QF_iqm_h
#define __QF_iqm_h
#include "QF/qtypes.h"
@ -149,4 +149,4 @@ typedef struct {
void *extra_data;
} iqm_t;
#endif//__QF_iqm_h__
#endif//__QF_iqm_h

View file

@ -25,8 +25,8 @@
*/
#ifndef __QF_joystick_h_
#define __QF_joystick_h_
#ifndef __QF_joystick_h
#define __QF_joystick_h
#include <QF/qtypes.h>
#include "QF/quakeio.h"
@ -154,4 +154,4 @@ int JOY_GetAxis_i (int dest, const char *c);
void Joy_WriteBindings (QFile *f);
#endif // __QF_joystick_h_
#endif//__QF_joystick_h

View file

@ -26,8 +26,8 @@
*/
#ifndef _KEYS_H
#define _KEYS_H
#ifndef __QF_keys_h
#define __QF_keys_h
#ifndef __QFCC__
# include "QF/qtypes.h"
@ -661,4 +661,4 @@ void Key_Progs_Init (struct progs_s *pr);
///@}
#endif // _KEYS_H
#endif//__QF_keys_h

View file

@ -25,8 +25,8 @@
*/
#ifndef _LINK_H
#define _LINK_H
#ifndef __QF_link_h
#define __QF_link_h
// (type *)STRUCT_FROM_LINK(link_t *link, type, member)
// ent = STRUCT_FROM_LINK(link,entity_t,order)
@ -43,4 +43,4 @@ void RemoveLink (link_t *l);
void InsertLinkBefore (link_t *l, link_t *before);
void InsertLinkAfter (link_t *l, link_t *after);
#endif // _LINK_H
#endif//__QF_link_h

View file

@ -25,8 +25,8 @@
*/
#ifndef _LLIST_H
#define _LLIST_H
#ifndef __QF_llist_h
#define __QF_llist_h
#include "QF/qtypes.h"
@ -112,4 +112,4 @@ void *llist_createarray (llist_t *list, size_t esize);
//@}
#endif
#endif//__QF_llist_h

View file

@ -25,8 +25,8 @@
*/
#ifndef __locs_h
#define __locs_h
#ifndef __QF_locs_h
#define __QF_locs_h
#include "QF/qtypes.h"
@ -47,4 +47,4 @@ void locs_reset (void);
void locs_save (const char *filename, qboolean gz);
void map_to_loc (const char *mapname, char *filename);
#endif // __locs_h
#endif//__QF_locs_h

View file

@ -25,8 +25,8 @@
*/
#ifndef __mathlib_h
#define __mathlib_h
#ifndef __QF_mathlib_h
#define __QF_mathlib_h
/** \defgroup mathlib Vector and matrix functions
\ingroup utils
@ -220,4 +220,4 @@ void BarycentricCoords (const vec_t **points, int num_points, const vec3_t p,
///@}
#endif // __mathlib_h
#endif//__QF_mathlib_h

View file

@ -26,8 +26,8 @@
*/
#ifndef __mdfour_h
#define __mdfour_h
#ifndef __QF_mdfour_h
#define __QF_mdfour_h
/** \addtogroup crc
*/
@ -49,4 +49,4 @@ void mdfour(unsigned char *out, const unsigned char *in, int n);
///@}
#endif // __mdfour_h
#endif//__QF_mdfour_h

View file

@ -25,8 +25,8 @@
*/
#ifndef _MODEL_H
#define _MODEL_H
#ifndef __QF_model_h
#define __QF_model_h
#include "QF/qtypes.h"
#include "QF/bspfile.h"
@ -468,4 +468,4 @@ extern byte *mod_base;
extern byte mod_novis[MAX_MAP_LEAFS / 8];
extern int mod_lightmap_bytes;
#endif // _MODEL_H
#endif//__QF_model_h

View file

@ -31,8 +31,8 @@
// * pass data from one to the other via model files. *
// *********************************************************
#ifndef _MODELGEN_H
#define _MODELGEN_H
#ifndef __QF_modelgen_h
#define __QF_modelgen_h
#include "QF/mathlib.h"
@ -142,4 +142,4 @@ typedef struct {
// little-endian "IDP2"
#define IDHEADER_MD2 (('2'<<24)+('P'<<16)+('D'<<8)+'I')
#endif // _MODELGEN_H
#endif//__QF_modelgen_h

View file

@ -24,8 +24,8 @@
Boston, MA 02111-1307, USA
*/
#ifndef _MSG_H
#define _MSG_H
#ifndef __QF_msg_h
#define __QF_msg_h
/** \defgroup msg Message reading and writing
\ingroup utils
@ -251,4 +251,4 @@ int MSG_ReadUTF8 (qmsg_t *msg);
///@}
#endif
#endif//__QF_msg_h

View file

@ -32,8 +32,8 @@
*/
#ifndef __object_h
#define __object_h
#ifndef __QF_object_h
#define __QF_object_h
#include "QF/qtypes.h"
@ -115,4 +115,4 @@ void Object_Garbage_Collect (void);
#include "QF/classes/String.h"
#endif
#endif//__QF_object_h

View file

@ -28,8 +28,8 @@
*/
#ifndef __qf_pak_h
#define __qf_pak_h
#ifndef __QF_pak_h
#define __QF_pak_h
/** \addtogroup pak
*/
@ -53,4 +53,4 @@ typedef struct {
///@}
#endif//__qf_pak_h
#endif//__QF_pak_h

View file

@ -24,8 +24,8 @@
Boston, MA 02111-1307, USA
*/
#ifndef __pcx_h
#define __pcx_h
#ifndef __QF_pcx_h
#define __QF_pcx_h
#include "QF/qtypes.h"
#include "QF/quakeio.h"
@ -77,4 +77,4 @@ pcx_t *EncodePCX (byte *data, int width, int height, int rowbytes,
*/
struct tex_s *LoadPCX (QFile *f, qboolean convert, byte *pal);
#endif // __pcx_h
#endif//__QF_pcx_h

View file

@ -25,8 +25,8 @@
*/
#ifndef __QF_plugin_h_
#define __QF_plugin_h_
#ifndef __QF_plugin_h
#define __QF_plugin_h
/** \defgroup plugin Plugins
\ingroup utils
@ -113,4 +113,4 @@ void PI_Shutdown (void);
///@}
#endif // __QF_plugin_h_
#endif//__QF_plugin_h

View file

@ -18,8 +18,8 @@
*/
// this file is shared by QuakeForge and qfcc
#ifndef __pr_comp_h
#define __pr_comp_h
#ifndef __QF_pr_comp_h
#define __QF_pr_comp_h
#include "QF/qtypes.h"
@ -513,4 +513,4 @@ typedef struct dprograms_s {
pr_uint_t entityfields;
} dprograms_t;
#endif // __pr_comp_h
#endif//__QF_pr_comp_h

View file

@ -28,8 +28,8 @@
*/
#ifndef __pr_debug_h
#define __pr_debug_h
#ifndef __QF_pr_debug_h
#define __QF_pr_debug_h
#include "QF/pr_comp.h"
@ -65,4 +65,4 @@ typedef struct pr_debug_header_s {
pr_uint_t num_locals;
} pr_debug_header_t;
#endif//__pr_debug_h
#endif//__QF_pr_debug_h

View file

@ -28,8 +28,8 @@
*/
#ifndef __pr_obj_h
#define __pr_obj_h
#ifndef __QF_pr_obj_h
#define __QF_pr_obj_h
#include "QF/pr_comp.h"
@ -185,4 +185,4 @@ typedef struct pr_super_s {
pointer_t class;
} pr_super_t;
#endif//__pr_obj_h
#endif//__QF_pr_obj_h

View file

@ -28,8 +28,8 @@
*/
#ifndef __pr_type_h
#define __pr_type_h
#ifndef __QF_pr_type_h
#define __QF_pr_type_h
/** \defgroup qfcc_qfo_type Object file type encoding
\ingroup progs
@ -121,4 +121,4 @@ typedef struct qfot_type_encodings_s {
///@}
#endif//__pr_type_h
#endif//__QF_pr_type_h

View file

@ -27,8 +27,8 @@
*/
#ifndef __qargs_h
#define __qargs_h
#ifndef __QF_qargs_h
#define __QF_qargs_h
/** \addtogroup misc
*/
@ -52,4 +52,4 @@ void COM_ParseConfig (void);
///@}
#endif // __qargs_h
#endif//__QF_qargs_h

View file

@ -27,8 +27,8 @@
*/
#ifndef __qdefs_h
#define __qdefs_h
#ifndef __QF_qdefs_h
#define __QF_qdefs_h
#define MAX_QPATH 64
#define MAX_CL_STATS 32
@ -40,4 +40,4 @@
#define clc_stringcmd 4
#endif // __qdefs_h
#endif//__QF_qdefs_h

View file

@ -27,8 +27,8 @@
*/
#ifndef __qendian_h
#define __qendian_h
#ifndef __QF_qendian_h
#define __QF_qendian_h
/** \defgroup qendian Endian handling functions
\ingroup utils
@ -120,4 +120,4 @@ unsigned int ReadLong (struct QFile_s *file);
///@}
#endif // __qendian_h
#endif//__QF_qendian_h

View file

@ -25,8 +25,8 @@
*/
#ifndef __QF_qfplist_h_
#define __QF_qfplist_h_
#ifndef __QF_qfplist_h
#define __QF_qfplist_h
/** \defgroup qfplist Property lists
\ingroup utils
@ -228,4 +228,4 @@ void PL_Free (plitem_t *item);
///@}
#endif // __QF_qfplist_h_
#endif//__QF_qfplist_h

View file

@ -27,8 +27,8 @@
*/
#ifndef __qtypes_h
#define __qtypes_h
#ifndef __QF_qtypes_h
#define __QF_qtypes_h
#include <stdio.h>
#include <stdint.h>
@ -115,4 +115,4 @@ typedef struct sphere_s {
vec_t radius;
} sphere_t;
#endif // __qtypes_h
#endif//__QF_qtypes_h

View file

@ -27,8 +27,8 @@
*/
#ifndef __quakefs_h
#define __quakefs_h
#ifndef __QF_quakefs_h
#define __QF_quakefs_h
/** \defgroup quakefs Quake Filesystem
\ingroup utils
@ -420,4 +420,4 @@ void QFS_FilelistFree (filelist_t *list);
///@}
#endif // __quakefs_h
#endif//__QF_quakefs_h

View file

@ -26,8 +26,8 @@
Boston, MA 02111-1307, USA
*/
#ifndef __quakeio_h
#define __quakeio_h
#ifndef __QF_quakeio_h
#define __QF_quakeio_h
#include <stdio.h>
@ -62,4 +62,4 @@ const char *Qgetline(QFile *file);
///@}
#endif /*__quakeio_h*/
#endif//__QF_quakeio_h

View file

@ -25,8 +25,8 @@
*/
#ifndef __render_h
#define __render_h
#ifndef __QF_render_h
#define __QF_render_h
#include "QF/mathlib.h"
#include "QF/model.h"
@ -177,4 +177,4 @@ void R_LoadModule (void (*load_gl)(void),
struct progs_s;
void R_Progs_Init (struct progs_s *pr);
#endif // __render_h
#endif//__QF_render_h

View file

@ -26,8 +26,8 @@
*/
// screen.h
#ifndef __screen_h
#define __screen_h
#ifndef __QF_screen_h
#define __QF_screen_h
#include "QF/qtypes.h"
@ -67,4 +67,4 @@ extern struct qpic_s *scr_turtle;
extern struct cvar_s *hud_fps, *hud_time;
#endif // __screen_h
#endif//__QF_screen_h

View file

@ -24,8 +24,8 @@
Boston, MA 02111-1307, USA
*/
#ifndef __sizebuf_h
#define __sizebuf_h
#ifndef __QF_sizebuf_h
#define __QF_sizebuf_h
/** \defgroup sizebuf Fixed Size Buffers
\ingroup utils
@ -53,4 +53,4 @@ void SZ_Print (sizebuf_t *buf, const char *data); // strcats onto the sizebuf
///@}
#endif // __sizebuf_h
#endif//__QF_sizebuf_h

View file

@ -25,8 +25,8 @@
*/
#ifndef _SKIN_H
#define _SKIN_H
#ifndef __QF_skin_h
#define __QF_skin_h
#include "QF/qtypes.h"
#include "QF/vid.h"
@ -57,4 +57,4 @@ typedef struct skin_s {
int auxtex;
} skin_t;
#endif
#endif//__QF_skin_h

View file

@ -26,8 +26,8 @@
*/
// sound.h -- client sound i/o functions
#ifndef _SOUND_H
#define _SOUND_H
#ifndef __QF_sound_h
#define __QF_sound_h
/** \defgroup sound QuakeForge sound engine
*/
@ -195,4 +195,4 @@ void S_Progs_Init (struct progs_s *pr);
///@}
#endif // _SOUND_H
#endif//__QF_sound_h

View file

@ -45,8 +45,8 @@
// <endrepeat>
//-------------------------------------------------------
#ifndef _SPRITEGN_H
#define _SPRITEGN_H
#ifndef __QF_sprintgn_h
#define __QF_sprintgn_h
#define SPR_VERSION 1
#define SP2_VERSION 2
@ -102,4 +102,4 @@ typedef struct {
// little-endian "IDS2"
#define IDHEADER_SP2 (('2'<<24)+('S'<<16)+('D'<<8)+'I')
#endif // _SPRITEGN_H
#endif//__QF_sprintgn_h

View file

@ -25,8 +25,8 @@
*/
#ifndef __sys_h
#define __sys_h
#ifndef __QF_sys_h
#define __QF_sys_h
/** \defgroup sys System Portability
\ingroup utils
@ -159,4 +159,4 @@ char *Sys_ExpandSquiggle (const char *path);
///@}
#endif // __sys_h
#endif//__QF_sys_h

View file

@ -25,8 +25,8 @@
*/
#ifndef __teamplay_h
#define __teamplay_h
#ifndef __QF_teamplay_h
#define __QF_teamplay_h
extern struct cvar_s *cl_parsesay;
extern struct cvar_s *cl_nofake;
@ -47,4 +47,4 @@ const char *Team_ParseSay (struct dstring_s *buf, const char *);
void Locs_Init (void);
void Team_ParseChat (const char *string);
void Team_ResetTimers (void);
#endif // __teamplay_h
#endif//__QF_teamplay_h

View file

@ -25,8 +25,8 @@
*/
#ifndef __tga_h
#define __tga_h
#ifndef __QF_tga_h
#define __QF_tga_h
#include "QF/qtypes.h"
#include "QF/quakeio.h"
@ -70,4 +70,4 @@ typedef struct _TargaHeader {
struct tex_s *LoadTGA (QFile *fin);
void WriteTGAfile (const char *tganame, byte *data, int width, int height);
#endif // __tga_h
#endif//__QF_tga_h

View file

@ -1,52 +0,0 @@
/*
uint32.h
Definitions for portable (?) unsigned int
Copyright (C) 2000 Jeff Teunissen <d2deek@pmail.net>
Author: Jeff Teunissen <d2deek@pmail.net>
Date: 01 Jan 2000
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to:
Free Software Foundation, Inc.
59 Temple Place - Suite 330
Boston, MA 02111-1307, USA
*/
#ifndef __uint32_h
#define __uint32_h
#ifndef int32
# if (SIZEOF_INT == 4)
# define int32 int
# elif (SIZEOF_LONG == 4)
# define int32 long
# elif (SIZEOF_SHORT == 4)
# define int32 short
# else
/* I hope this works */
# define int32 int
# define LARGE_INT32
# endif
#endif
#ifndef uint32
# define uint32 unsigned int32
#endif
#endif // __uint32_h

View file

@ -26,8 +26,8 @@
*/
#ifndef __va_h
#define __va_h
#ifndef __QF_va_h
#define __QF_va_h
/** \addtogroup misc
Formatted printing.
@ -41,4 +41,4 @@ char *nva(const char *format, ...) __attribute__((format(printf,1,2)));
///@}
#endif // __va_h
#endif//__QF_va_h

View file

@ -25,8 +25,8 @@
*/
#ifndef __ver_check_h_
#define __ver_check_h_
#ifndef __QF_ver_check_h
#define __QF_ver_check_h
/** \defgroup utils Utils
*/
@ -47,4 +47,4 @@ int ver_compare (const char *, const char *);
///@}
#endif // __ver_check_h_
#endif//__QF_ver_check_h

View file

@ -25,8 +25,8 @@
*/
#ifndef __vid_h_
#define __vid_h_
#ifndef __QF_vid_h
#define __QF_vid_h
#include "QF/qtypes.h"
#include "QF/vrect.h"
@ -89,4 +89,4 @@ void VID_Init (byte *palette, byte *colormap);
void VID_Shutdown (void);
void VID_SetCaption (const char *text);
#endif // __vid_h_
#endif//__QF_vid_h

View file

@ -28,8 +28,8 @@
*/
#ifndef __qf_view_h
#define __qf_view_h
#ifndef __QF_view_h
#define __QF_view_h
/** \defgroup console_view Console View Objects
\ingroup console
@ -217,4 +217,4 @@ void view_move (view_t *view, int xp, int yp);
///@}
#endif//__qf_view_h
#endif//__QF_view_h

View file

@ -26,8 +26,8 @@
*/
// wad.h
#ifndef _WAD_H
#define _WAD_H
#ifndef __QF_wad_h
#define __QF_wad_h
/** \addtogroup wad
Wad Files
@ -48,4 +48,4 @@ void SwapPic (qpic_t *pic);
///@}
#endif // _WAD_H
#endif//__QF_wad_h

View file

@ -24,8 +24,8 @@
Boston, MA 02111-1307, USA
*/
#ifndef __zone_h
#define __zone_h
#ifndef __QF_zone_h
#define __QF_zone_h
/** \defgroup zone Memory Management
\ingroup utils
@ -142,4 +142,4 @@ int Cache_ReadLock (cache_user_t *c) __attribute__((pure));
///@}
#endif // __zone_h
#endif//__QF_zone_h