mirror of
https://github.com/kevinbentley/Descent3.git
synced 2025-01-22 11:28:56 +00:00
Remove dublicate byteswap.h
Linux-specific byteswap.h just includes BYTESWAP.H, so there no need platform-specific header. Fixes "non-portable path to file" ([-Wnonportable-include-path]) warnings.
This commit is contained in:
parent
84c04ebf13
commit
9e6ebbc8fb
@ -8,7 +8,7 @@
|
|||||||
#include "audiotaunts.h"
|
#include "audiotaunts.h"
|
||||||
#include "CFILE.H"
|
#include "CFILE.H"
|
||||||
#include "audio_encode.h"
|
#include "audio_encode.h"
|
||||||
#include "BYTESWAP.H"
|
#include "byteswap.h"
|
||||||
#include "mem.h"
|
#include "mem.h"
|
||||||
#include "ddio.h"
|
#include "ddio.h"
|
||||||
#include "manage.h"
|
#include "manage.h"
|
||||||
|
@ -55,7 +55,7 @@
|
|||||||
|
|
||||||
#include "mem.h"
|
#include "mem.h"
|
||||||
#include "iff.h"
|
#include "iff.h"
|
||||||
#include "BYTESWAP.H"
|
#include "byteswap.h"
|
||||||
#include "CFILE.H"
|
#include "CFILE.H"
|
||||||
#include "pserror.h"
|
#include "pserror.h"
|
||||||
#include "pstypes.h"
|
#include "pstypes.h"
|
||||||
|
@ -121,7 +121,7 @@
|
|||||||
#include "mono.h"
|
#include "mono.h"
|
||||||
#include "grdefs.h"
|
#include "grdefs.h"
|
||||||
#include "texture.h"
|
#include "texture.h"
|
||||||
#include "BYTESWAP.H"
|
#include "byteswap.h"
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include "mem.h"
|
#include "mem.h"
|
||||||
|
|
||||||
|
@ -15,7 +15,7 @@
|
|||||||
// Linux Build Includes
|
// Linux Build Includes
|
||||||
#include "linux/linux_fix.h"
|
#include "linux/linux_fix.h"
|
||||||
#endif
|
#endif
|
||||||
#include "BYTESWAP.H"
|
#include "byteswap.h"
|
||||||
#include "pserror.h"
|
#include "pserror.h"
|
||||||
#include "ddio.h"
|
#include "ddio.h"
|
||||||
#include "psglob.h"
|
#include "psglob.h"
|
||||||
|
@ -87,7 +87,7 @@
|
|||||||
#include "mem.h"
|
#include "mem.h"
|
||||||
#include "pserror.h"
|
#include "pserror.h"
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include "BYTESWAP.H"
|
#include "byteswap.h"
|
||||||
|
|
||||||
sound_info Sounds[MAX_SOUNDS];
|
sound_info Sounds[MAX_SOUNDS];
|
||||||
sound_file_info SoundFiles[MAX_SOUND_FILES];
|
sound_file_info SoundFiles[MAX_SOUND_FILES];
|
||||||
|
@ -1,69 +0,0 @@
|
|||||||
/*
|
|
||||||
* $Logfile: /DescentIII/Main/Lib/BYTESWAP.H $
|
|
||||||
* $Revision: 1.5 $
|
|
||||||
* $Date: 2004/12/05 04:00:20 $
|
|
||||||
* $Author: ryan $
|
|
||||||
*
|
|
||||||
* Byteswapping macros (for big-endian machines)
|
|
||||||
*
|
|
||||||
* $Log: byteswap.h,v $
|
|
||||||
* Revision 1.5 2004/12/05 04:00:20 ryan
|
|
||||||
* MacOS X patches.
|
|
||||||
*
|
|
||||||
* Revision 1.4 2004/02/25 00:04:06 ryan
|
|
||||||
* Removed loki_utils dependency and ported to MacOS X (runs, but incomplete).
|
|
||||||
*
|
|
||||||
* Revision 1.3 2004/02/09 04:14:51 kevinb
|
|
||||||
* Added newlines to all headers to reduce number of warnings printed
|
|
||||||
*
|
|
||||||
* Made some small changes to get everything compiling.
|
|
||||||
*
|
|
||||||
* All Ready to merge the 1.5 tree.
|
|
||||||
*
|
|
||||||
* Revision 1.2 2000/06/03 14:33:51 icculus
|
|
||||||
* Merge with Outrage 1.4 tree...
|
|
||||||
*
|
|
||||||
* Revision 1.1 2000/04/18 00:28:25 icculus
|
|
||||||
* Used to be capitalized: BYTESWAP.H. Yuck.
|
|
||||||
*
|
|
||||||
* Revision 1.1.1.1 2000/04/18 00:00:38 icculus
|
|
||||||
* initial checkin
|
|
||||||
*
|
|
||||||
*
|
|
||||||
* 7 10/21/99 9:27p Jeff
|
|
||||||
* B.A. Macintosh code merge
|
|
||||||
*
|
|
||||||
* 6 5/09/99 11:41p Jeff
|
|
||||||
* function free
|
|
||||||
*
|
|
||||||
* 5 5/05/99 5:27a Jeff
|
|
||||||
* renamed endian.h to psendian.h
|
|
||||||
*
|
|
||||||
* 4 5/01/99 2:52p Jeff
|
|
||||||
* added automatic endian detection of the system
|
|
||||||
*
|
|
||||||
* 3 4/17/99 7:49p Jeff
|
|
||||||
* for some reason Linux thinks it's big endian, temp fix (undef) until I
|
|
||||||
* get around to writting a endian check function
|
|
||||||
*
|
|
||||||
* 2 1/09/99 4:38p Jeff
|
|
||||||
* added some ifdefs and fixes to get files to compile under Linux
|
|
||||||
*
|
|
||||||
* 5 5/15/97 2:22p Matt
|
|
||||||
* Fixed (hopefully; it's not tested yet) byteswapping for floats
|
|
||||||
*
|
|
||||||
* 4 2/10/97 2:22p Matt
|
|
||||||
* Added cast
|
|
||||||
*
|
|
||||||
* 3 2/10/97 2:14p Matt
|
|
||||||
* Added BIG_ENDIAN define, & INT_FLOAT() macro
|
|
||||||
*
|
|
||||||
* $NoKeywords: $
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef _BYTESWAP_LINUX_H
|
|
||||||
#define _BYTESWAP_LINUX_H
|
|
||||||
|
|
||||||
#include "BYTESWAP.H"
|
|
||||||
|
|
||||||
#endif
|
|
@ -24,7 +24,7 @@
|
|||||||
#endif
|
#endif
|
||||||
#include <cstring>
|
#include <cstring>
|
||||||
#include "pserror.h"
|
#include "pserror.h"
|
||||||
#include "BYTESWAP.H"
|
#include "byteswap.h"
|
||||||
using namespace AudioDecoder;
|
using namespace AudioDecoder;
|
||||||
|
|
||||||
namespace {
|
namespace {
|
||||||
|
@ -13,7 +13,7 @@
|
|||||||
#error No platform defined
|
#error No platform defined
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "BYTESWAP.H"
|
#include "byteswap.h"
|
||||||
//--------------------------------
|
//--------------------------------
|
||||||
// Compressed Video Constants
|
// Compressed Video Constants
|
||||||
//--------------------------------
|
//--------------------------------
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
There is now warranty.
|
There is now warranty.
|
||||||
|
|
||||||
Feb. 12. 2005
|
Feb. 12. 2005
|
||||||
Benjamin Grüdelbach
|
Benjamin Grüdelbach
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@ -33,7 +33,7 @@
|
|||||||
|
|
||||||
// md5 class include
|
// md5 class include
|
||||||
#include "md5.h"
|
#include "md5.h"
|
||||||
#include <BYTESWAP.H>
|
#include <byteswap.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
#include "stdio.h"
|
#include "stdio.h"
|
||||||
|
@ -67,7 +67,7 @@
|
|||||||
#include "grdefs.h"
|
#include "grdefs.h"
|
||||||
#include "polymodel.h"
|
#include "polymodel.h"
|
||||||
#include "gametexture.h"
|
#include "gametexture.h"
|
||||||
#include "BYTESWAP.H"
|
#include "byteswap.h"
|
||||||
#include "renderer.h"
|
#include "renderer.h"
|
||||||
#include "lighting.h"
|
#include "lighting.h"
|
||||||
#include "game.h"
|
#include "game.h"
|
||||||
|
Loading…
Reference in New Issue
Block a user