X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fnetradiant.git;a=blobdiff_plain;f=tools%2Fquake3%2Fq3data%2Fmd3lib.c;h=4ad23e49e7274fd8bed13e9da7265102da42c670;hp=66dfa52d8283682dcb46b8706aa1100ea25526e3;hb=0f2e4b773715b05595f1c149d99fcc4795e01948;hpb=a726c43661057f338f342f13c93ee0fe76698cf7 diff --git a/tools/quake3/q3data/md3lib.c b/tools/quake3/q3data/md3lib.c index 66dfa52d..4ad23e49 100644 --- a/tools/quake3/q3data/md3lib.c +++ b/tools/quake3/q3data/md3lib.c @@ -19,20 +19,23 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "globaldefs.h" #include -#ifdef WIN32 +#if GDEF_OS_WINDOWS #include #endif #include "md3lib.h" -#if defined ( __linux__ ) || defined ( __APPLE__ ) -#define filelength Q_filelength +#if GDEF_OS_LINUX || GDEF_OS_MACOS +#define filelength(f) Q_filelength(f) +#else +#define filelength(f) filelength(fileno(f)) #endif /* ** MD3_ComputeTagFromTri */ -void MD3_ComputeTagFromTri( md3Tag_t *pTag, const float pTri[3][3] ){ +void MD3_ComputeTagFromTri( md3Tag_t *pTag, float pTri[3][3] ){ float len[3]; vec3_t axes[3], sides[3]; int longestSide, shortestSide, hypotSide; @@ -149,8 +152,8 @@ void MD3_Dump( const char *filename ){ Error( "Unable to open '%s'\n", filename ); } - fileSize = filelength( fileno( fp ) ); - _buffer = malloc( filelength( fileno( fp ) ) ); + fileSize = filelength( fp ); + _buffer = malloc( fileSize ); fread( _buffer, fileSize, 1, fp ); fclose( fp );