quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove NeXT preprocessor conditions

Browse Source
This commit is contained in:
Garux 2020-01-24 02:47:33 +03:00
parent 4317ea2ab0
commit 0290bd76fe
8 changed files with 5 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tools/mbspc/mbspc/l_cmd.c
View File

@ -33,11 +33,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#define SIN #define SIN
#endif //SIN #endif //SIN
#ifdef NeXT
#include <libc.h>
#endif
#define BASEDIRNAME "quake2" #define BASEDIRNAME "quake2"
#define PATHSEPERATOR '/' #define PATHSEPERATOR '/'

8
tools/mbspc/mbspc/l_threads.c
View File

@ -626,7 +626,7 @@ void RunThreadsOn(int workcnt, qboolean showpacifier, void(*func)(int))
if (pthread_create(&work_threads[i], NULL, (void *)func, (void *)i) == -1) if (pthread_create(&work_threads[i], NULL, (void *)func, (void *)i) == -1)
Error ("pthread_create failed"); Error ("pthread_create failed");
} }
for (i=0 ; i<numthreads ; i++) for (i=0 ; i<numthreads ; i++)
{ {
if (pthread_join(work_threads[i], &pthread_return) == -1) if (pthread_join(work_threads[i], &pthread_return) == -1)
@ -874,11 +874,7 @@ void RunThreadsOn(int workcnt, qboolean showpacifier, void(*func)(int))
workcount = workcnt; workcount = workcnt;
oldf = -1; oldf = -1;
pacifier = showpacifier; pacifier = showpacifier;
start = I_FloatTime (); start = I_FloatTime ();
#ifdef NeXT
if (pacifier)
setbuf (stdout, NULL);
#endif
func(0); func(0);
end = I_FloatTime (); end = I_FloatTime ();

4
tools/quake2/common/cmdlib.c
View File

@ -36,10 +36,6 @@
#include <unistd.h> #include <unistd.h>
#endif #endif
#ifdef NeXT
#include <libc.h>
#endif
#define BASEDIRNAME "quake" // assumed to have a 2 or 3 following #define BASEDIRNAME "quake" // assumed to have a 2 or 3 following
#define HERETIC2_BASEDIRNAME "h" #define HERETIC2_BASEDIRNAME "h"
#define PATHSEPERATOR '/' #define PATHSEPERATOR '/'

6
tools/quake2/qdata/qdata.c
View File

@ -212,7 +212,7 @@ void Cmd_File( void ){
=============== ===============
*/ */
#ifdef _WIN32 #ifdef WIN32
#include "io.h" #include "io.h"
void PackDirectory_r( char *dir ){ void PackDirectory_r( char *dir ){
struct _finddata_t fileinfo; struct _finddata_t fileinfo;
@ -248,11 +248,7 @@ void PackDirectory_r( char *dir ){
#include <sys/dir.h> #include <sys/dir.h>
void PackDirectory_r( char *dir ){ void PackDirectory_r( char *dir ){
#ifdef NeXT
struct direct **namelist, *ent;
#else
struct dirent **namelist, *ent; struct dirent **namelist, *ent;
#endif
int count; int count;
struct stat st; struct stat st;
int i; int i;

4
tools/quake2/qdata_heretic2/common/cmdlib.c
View File

@ -36,10 +36,6 @@
#include <unistd.h> #include <unistd.h>
#endif #endif
#ifdef NeXT
#include <libc.h>
#endif
#define BASEDIRNAME "h" #define BASEDIRNAME "h"
#define PATHSEPERATOR '/' #define PATHSEPERATOR '/'

10
tools/quake2/qdata_heretic2/qdata.c
View File

@ -202,7 +202,7 @@ void Cmd_File( void ){
=============== ===============
*/ */
#ifdef _WIN32 #ifdef WIN32
#include "io.h" #include "io.h"
void PackDirectory_r( char *dir ){ void PackDirectory_r( char *dir ){
struct _finddata_t fileinfo; struct _finddata_t fileinfo;
@ -235,18 +235,10 @@ void PackDirectory_r( char *dir ){
#else #else
#include <sys/types.h> #include <sys/types.h>
#ifdef NeXT
#include <sys/dir.h>
#else
#include <dirent.h> #include <dirent.h>
#endif
void PackDirectory_r( char *dir ){ void PackDirectory_r( char *dir ){
#ifdef NeXT
struct direct **namelist, *ent;
#else
struct dirent **namelist, *ent; struct dirent **namelist, *ent;
#endif
int count; int count;
struct stat st; struct stat st;
int i; int i;

4
tools/quake3/common/cmdlib.c
View File

@ -43,10 +43,6 @@
#include <unistd.h> #include <unistd.h>
#endif #endif
#ifdef NeXT
#include <libc.h>
#endif
#define BASEDIRNAME "quake" // assumed to have a 2 or 3 following #define BASEDIRNAME "quake" // assumed to have a 2 or 3 following
#ifdef SAFE_MALLOC #ifdef SAFE_MALLOC

10
tools/quake3/q3data/q3data.c
View File

@ -289,7 +289,7 @@ void Cmd_File( void ){
=============== ===============
*/ */
#ifdef _WIN32 #ifdef WIN32
#include "io.h" #include "io.h"
void PackDirectory_r( char *dir ){ void PackDirectory_r( char *dir ){
struct _finddata_t fileinfo; struct _finddata_t fileinfo;
@ -322,18 +322,10 @@ void PackDirectory_r( char *dir ){
#else #else
#include <sys/types.h> #include <sys/types.h>
#ifndef WIN32
#include <sys/dir.h> #include <sys/dir.h>
#else
#include <sys/dirent.h>
#endif
void PackDirectory_r( char *dir ){ void PackDirectory_r( char *dir ){
#ifdef NeXT
struct direct **namelist, *ent;
#else
struct dirent **namelist, *ent; struct dirent **namelist, *ent;
#endif
int count; int count;
struct stat st; struct stat st;
int i; int i;