mirror of
https://git.code.sf.net/p/quake/newtree
synced 2024-11-21 19:51:18 +00:00
fix up <> vs "" in #includes
This commit is contained in:
parent
60fe4aea40
commit
f29ea7f1d3
8 changed files with 24 additions and 23 deletions
|
@ -30,9 +30,7 @@
|
|||
#ifndef _MDFOUR_H
|
||||
#define _MDFOUR_H
|
||||
|
||||
#ifndef _UINT32_H
|
||||
#include <uint32.h>
|
||||
#endif
|
||||
#include "uint32.h"
|
||||
|
||||
struct mdfour {
|
||||
uint32 A, B, C, D;
|
||||
|
|
|
@ -31,7 +31,7 @@
|
|||
#ifndef _QARGS_H
|
||||
#define _QARGS_H
|
||||
|
||||
#include <qtypes.h>
|
||||
#include "qtypes.h"
|
||||
|
||||
extern int com_argc;
|
||||
extern char **com_argv;
|
||||
|
|
|
@ -31,7 +31,7 @@
|
|||
#define _QUAKEIO_H
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
# include <config.h>
|
||||
# include "config.h"
|
||||
#endif
|
||||
|
||||
#include <stdio.h>
|
||||
|
|
|
@ -30,7 +30,7 @@
|
|||
#define __ver_check_h_
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
# include <config.h>
|
||||
# include "config.h"
|
||||
#endif
|
||||
|
||||
/*
|
||||
|
|
|
@ -32,10 +32,10 @@
|
|||
|
||||
#include <fcntl.h>
|
||||
#ifdef HAVE_STRING_H
|
||||
#include "string.h"
|
||||
#include <string.h>
|
||||
#endif
|
||||
#ifdef HAVE_STRINGS_H
|
||||
#include "strings.h"
|
||||
#include <strings.h>
|
||||
#endif
|
||||
#include <errno.h>
|
||||
#ifdef HAVE_SYS_IOCTL_H
|
||||
|
|
|
@ -33,10 +33,10 @@
|
|||
# include <windows.h>
|
||||
#endif
|
||||
#ifdef HAVE_STRING_H
|
||||
#include "string.h"
|
||||
#include <string.h>
|
||||
#endif
|
||||
#ifdef HAVE_STRINGS_H
|
||||
#include "strings.h"
|
||||
#include <strings.h>
|
||||
#endif
|
||||
|
||||
#include <SDL.h>
|
||||
|
|
|
@ -30,7 +30,17 @@
|
|||
# include "config.h"
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_STRING_H
|
||||
#include <string.h>
|
||||
#endif
|
||||
#ifdef HAVE_STRINGS_H
|
||||
#include <strings.h>
|
||||
#endif
|
||||
#include <ctype.h>
|
||||
#include <netinet/in.h>
|
||||
#ifdef HAVE_WINSOCK_H
|
||||
#include <winsock.h>
|
||||
#endif
|
||||
|
||||
#include "bothdefs.h"
|
||||
#include "buildnum.h"
|
||||
|
@ -42,6 +52,7 @@
|
|||
#include "cl_main.h"
|
||||
#include "cl_parse.h"
|
||||
#include "cl_pred.h"
|
||||
#include "cl_slist.h"
|
||||
#include "cl_tent.h"
|
||||
#include "client.h"
|
||||
#include "cmd.h"
|
||||
|
@ -49,6 +60,9 @@
|
|||
#include "cvar.h"
|
||||
#include "draw.h"
|
||||
#include "host.h"
|
||||
#ifdef _WIN32
|
||||
#include "in_win.h"
|
||||
#endif
|
||||
#include "input.h"
|
||||
#include "keys.h"
|
||||
#include "menu.h"
|
||||
|
@ -68,29 +82,18 @@
|
|||
#include "vid.h"
|
||||
#include "view.h"
|
||||
#include "va.h"
|
||||
#include "winquake.h"
|
||||
|
||||
#ifdef __sun
|
||||
/* Sun's model_t in sys/model.h conflicts w/ Quake's model_t */
|
||||
#define model_t sunmodel_t
|
||||
#endif
|
||||
|
||||
#ifdef _WIN32
|
||||
#include "winquake.h"
|
||||
#include "winsock.h"
|
||||
#include "in_win.h"
|
||||
#else
|
||||
#include <netinet/in.h>
|
||||
#endif
|
||||
|
||||
#ifdef __sun
|
||||
#undef model_t
|
||||
#endif
|
||||
|
||||
#include <cl_slist.h>
|
||||
#ifdef HAVE_STRINGS_H
|
||||
#include <strings.h>
|
||||
#endif
|
||||
|
||||
void CL_RemoveQFInfoKeys ();
|
||||
|
||||
// we need to declare some mouse variables here, because the menu system
|
||||
|
|
|
@ -30,7 +30,7 @@
|
|||
#define QUAKEWORLD
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
# include <config.h>
|
||||
# include "config.h"
|
||||
#endif
|
||||
|
||||
#include <ctype.h>
|
||||
|
|
Loading…
Reference in a new issue