Configure.in: minor changes.

include/* -- #defines so that you can #include them more than once.

include/bothdefs.h

@@ -20,11 +20,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 // defs common to client and server
 
-#define QSG_STANDARD	"1"
-#define QW_VERSION	"2.40"
-#define QF_VERSION	"newtree test build"
-
-
 #if USE_INTEL_ASM
 #define UNALIGNED_OK	1	// set to 0 if unaligned accesses are not supported
 #else

include/bspfile.h

@@ -18,6 +18,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
+#ifndef _BSPFILE_H
+#define _BSPFILE_H
 
 // upper design bounds
 
@@ -269,3 +271,4 @@ void	WriteBSPFile (char *filename);
 void	PrintBSPFileSizes (void);
 
 #endif
+#endif	// _BSPFILE_H

include/client.h

@@ -19,6 +19,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // client.h
 
+#ifndef _CLIENT_H
+#define _CLIENT_H
 
 typedef struct
 {
@@ -558,3 +560,5 @@ void	Skin_NextDownload (void);
 
 #define RSSHOT_WIDTH 320
 #define RSSHOT_HEIGHT 200
+
+#endif // _CLIENT_H

include/cmd.h

@@ -20,6 +20,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 // cmd.h -- Command buffer and command execution
 
+#ifndef _CMD_H
+#define _CMD_H
+
 //===========================================================================
 
 /*
@@ -106,3 +109,5 @@ void	Cmd_ForwardToServer (void);
 // so when they are typed in at the console, they will need to be forwarded.
 
 void Cmd_StuffCmds_f (void);
+
+#endif // _CMD_H

include/common.h

@@ -18,6 +18,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 // comndef.h  -- general definitions
+#ifndef _COMMON_H
+#define _COMMON_H
 
 typedef unsigned char 		byte;
 #define _DEF_BYTE_
@@ -226,3 +228,4 @@ byte	COM_BlockSequenceCheckByte (byte *base, int length, int sequence, unsigned
 byte	COM_BlockSequenceCRCByte (byte *base, int length, int sequence);
 
 int build_number( void );
+#endif // _COMMON_H

include/console.h

@@ -18,6 +18,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
+#ifndef _CONSOLE_H
+#define _CONSOLE_H
 //
 // console
 //
@@ -58,3 +60,4 @@ void Con_ToggleConsole_f (void);
 
 void Con_NotifyBox (char *text);	// during startup for sound / cd warnings
 
+#endif // _CONSOLE_H

include/draw.h

@@ -18,6 +18,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
+#ifndef _DRAW_H
+#define _DRAW_H
 // draw.h -- these are the only functions outside the refresh allowed
 // to touch the vid buffer
 
@@ -41,3 +43,5 @@ void Draw_Alt_String (int x, int y, char *str);
 qpic_t *Draw_PicFromWad (char *name);
 qpic_t *Draw_CachePic (char *path);
 void Draw_Crosshair(void);
+
+#endif // _DRAW_H

include/keys.h

@@ -18,6 +18,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
+#ifndef _KEYS_H
+#define _KEYS_H
 //
 // these are the key numbers that should be passed to Key_Event
 //
@@ -167,3 +169,4 @@ void Key_WriteBindings (FILE *f);
 void Key_SetBinding (int keynum, char *binding);
 void Key_ClearStates (void);
 
+#endif // _KEYS_H

include/mathlib.h

@@ -19,6 +19,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // mathlib.h
 
+#ifndef _MATHLIB_H
+#define _MATHLIB_H
+
 typedef float vec_t;
 typedef vec_t vec3_t[3];
 typedef vec_t vec5_t[5];
@@ -89,3 +92,5 @@ void RotatePointAroundVector( vec3_t dst, const vec3_t dir, const vec3_t point,
 	)										\
 	:										\
 		BoxOnPlaneSide( (emins), (emaxs), (p)))
+
+#endif // _MATHLIB_H

include/net.h

@@ -19,6 +19,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // net.h -- quake's interface to the networking layer
 
+#ifndef _NET_H
+#define _NET_H
+
 #define	PORT_ANY	-1
 
 typedef struct
@@ -112,3 +115,4 @@ void Netchan_Setup (netchan_t *chan, netadr_t adr, int qport);
 qboolean Netchan_CanPacket (netchan_t *chan);
 qboolean Netchan_CanReliable (netchan_t *chan);
 
+#endif // _NET_H

include/protocol.h

@@ -19,6 +19,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // protocol.h -- communications protocols
 
+#ifndef _PROTOCOL_H
+#define _PROTOCOL_H
+
 #define	PROTOCOL_VERSION	28
 
 #define QW_CHECK_HASH 0x5157
@@ -280,3 +283,4 @@ typedef struct usercmd_s
 	byte	impulse;
 } usercmd_t;
 
+#endif // _PROTOCOL_H

include/render.h

@@ -20,6 +20,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 // refresh.h -- public interface to refresh functions
 
+#ifndef _RENDER_H
+#define _RENDER_H
+
 #define	TOP_RANGE		16			// soldier uniform colors
 #define	BOTTOM_RANGE	96
 
@@ -151,3 +154,4 @@ void D_DeleteSurfaceCache (void);
 void D_InitCaches (void *buffer, int size);
 void R_SetVrect (vrect_t *pvrect, vrect_t *pvrectin, int lineadj);
 
+#endif // _RENDER_H

include/vid.h

@@ -19,6 +19,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // vid.h -- video driver defs
 
+#ifndef _VID_H
+#define _VID_H
+
 #define VID_CBITS	6
 #define VID_GRADES	(1 << VID_CBITS)
 
@@ -88,3 +91,5 @@ void VID_LockBuffer (void);
 void VID_UnlockBuffer (void);
 
 qboolean VID_Is8bit(void);
+
+#endif // _VID_H

include/wad.h

@@ -18,6 +18,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 // wad.h
+#ifndef _WAD_H
+#define _WAD_H
 
 //===============
 //   TYPES
@@ -73,3 +75,5 @@ void	*W_GetLumpName (char *name);
 void	*W_GetLumpNum (int num);
 
 void SwapPic (qpic_t *pic);
+
+#endif // _WAD_H

include/zone.h

@@ -17,6 +17,8 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
+#ifndef _ZONE_H
+#define _ZONE_H
 /*
  memory allocation
 
@@ -127,5 +129,4 @@ void *Cache_Alloc (cache_user_t *c, int size, char *name);
 
 void Cache_Report (void);
 
-
-
+#endif // _ZONE_H