mirror of
https://github.com/DrBeef/ioq3quest.git
synced 2024-11-10 23:02:01 +00:00
use system memcpy and memset
This commit is contained in:
parent
5201000f39
commit
b2f39d7ddd
5 changed files with 16 additions and 5 deletions
|
@ -1,3 +1,4 @@
|
||||||
|
#if 0 // not used anymore
|
||||||
/*
|
/*
|
||||||
===========================================================================
|
===========================================================================
|
||||||
Copyright (C) 1999-2005 Id Software, Inc.
|
Copyright (C) 1999-2005 Id Software, Inc.
|
||||||
|
@ -29,3 +30,4 @@ void Com_Memcpy (void* dest, const void* src, const size_t count) {
|
||||||
void Com_Memset (void* dest, const int val, const size_t count) {
|
void Com_Memset (void* dest, const int val, const size_t count) {
|
||||||
memset(dest, val, count);
|
memset(dest, val, count);
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
|
@ -2824,9 +2824,7 @@ void Com_Shutdown (void) {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#if !( defined __GNUC__ ) // GNU versions in linux_common.c
|
#if I_WANT_A_CUSTOM_MEMCPY && !defined(_WIN32)
|
||||||
#if !id386
|
|
||||||
|
|
||||||
void Com_Memcpy (void* dest, const void* src, const size_t count)
|
void Com_Memcpy (void* dest, const void* src, const size_t count)
|
||||||
{
|
{
|
||||||
memcpy(dest, src, count);
|
memcpy(dest, src, count);
|
||||||
|
@ -2837,7 +2835,7 @@ void Com_Memset (void* dest, const int val, const size_t count)
|
||||||
memset(dest, val, count);
|
memset(dest, val, count);
|
||||||
}
|
}
|
||||||
|
|
||||||
#else
|
#elif I_WANT_A_CUSTOM_MEMCPY && defined(_WIN32)
|
||||||
|
|
||||||
typedef enum
|
typedef enum
|
||||||
{
|
{
|
||||||
|
@ -3136,7 +3134,6 @@ skipClamp:
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
#endif
|
|
||||||
//------------------------------------------------------------------------
|
//------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -38,8 +38,13 @@ void MD4Init (MD4_CTX *);
|
||||||
void MD4Update (MD4_CTX *, const unsigned char *, unsigned int);
|
void MD4Update (MD4_CTX *, const unsigned char *, unsigned int);
|
||||||
void MD4Final (unsigned char [16], MD4_CTX *);
|
void MD4Final (unsigned char [16], MD4_CTX *);
|
||||||
|
|
||||||
|
#if I_WANT_A_CUSTOM_MEMCPY
|
||||||
void Com_Memset (void* dest, const int val, const size_t count);
|
void Com_Memset (void* dest, const int val, const size_t count);
|
||||||
void Com_Memcpy (void* dest, const void* src, const size_t count);
|
void Com_Memcpy (void* dest, const void* src, const size_t count);
|
||||||
|
#else
|
||||||
|
#define Com_Memset memset
|
||||||
|
#define Com_Memcpy memcpy
|
||||||
|
#endif
|
||||||
|
|
||||||
/* MD4C.C - RSA Data Security, Inc., MD4 message-digest algorithm */
|
/* MD4C.C - RSA Data Security, Inc., MD4 message-digest algorithm */
|
||||||
/* Copyright (C) 1990-2, RSA Data Security, Inc. All rights reserved.
|
/* Copyright (C) 1990-2, RSA Data Security, Inc. All rights reserved.
|
||||||
|
|
|
@ -237,8 +237,13 @@ void Snd_Memset (void* dest, const int val, const size_t count);
|
||||||
#define Snd_Memset Com_Memset
|
#define Snd_Memset Com_Memset
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if I_WANT_A_CUSTOM_MEMCPY
|
||||||
void Com_Memset (void* dest, const int val, const size_t count);
|
void Com_Memset (void* dest, const int val, const size_t count);
|
||||||
void Com_Memcpy (void* dest, const void* src, const size_t count);
|
void Com_Memcpy (void* dest, const void* src, const size_t count);
|
||||||
|
#else
|
||||||
|
#define Com_Memset memset
|
||||||
|
#define Com_Memcpy memcpy
|
||||||
|
#endif
|
||||||
|
|
||||||
#define CIN_system 1
|
#define CIN_system 1
|
||||||
#define CIN_loop 2
|
#define CIN_loop 2
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
#if 0 // not used anymore
|
||||||
/*
|
/*
|
||||||
===========================================================================
|
===========================================================================
|
||||||
Copyright (C) 1999-2005 Id Software, Inc.
|
Copyright (C) 1999-2005 Id Software, Inc.
|
||||||
|
@ -342,3 +343,4 @@ void Com_Prefetch (const void *s, const unsigned int bytes, e_prefetch type)
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
#endif
|
||||||
|
|
Loading…
Reference in a new issue