remove NeXT preprocessor conditions
This commit is contained in:
parent
4317ea2ab0
commit
0290bd76fe
|
|
@ -33,11 +33,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
|||
#define SIN
|
||||
#endif //SIN
|
||||
|
||||
|
||||
#ifdef NeXT
|
||||
#include <libc.h>
|
||||
#endif
|
||||
|
||||
#define BASEDIRNAME "quake2"
|
||||
#define PATHSEPERATOR '/'
|
||||
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
Error ("pthread_create failed");
|
||||
}
|
||||
|
||||
|
||||
for (i=0 ; i<numthreads ; i++)
|
||||
{
|
||||
if (pthread_join(work_threads[i], &pthread_return) == -1)
|
||||
|
|
@ -874,11 +874,7 @@ void RunThreadsOn(int workcnt, qboolean showpacifier, void(*func)(int))
|
|||
workcount = workcnt;
|
||||
oldf = -1;
|
||||
pacifier = showpacifier;
|
||||
start = I_FloatTime ();
|
||||
#ifdef NeXT
|
||||
if (pacifier)
|
||||
setbuf (stdout, NULL);
|
||||
#endif
|
||||
start = I_FloatTime ();
|
||||
func(0);
|
||||
|
||||
end = I_FloatTime ();
|
||||
|
|
|
|||
|
|
@ -36,10 +36,6 @@
|
|||
#include <unistd.h>
|
||||
#endif
|
||||
|
||||
#ifdef NeXT
|
||||
#include <libc.h>
|
||||
#endif
|
||||
|
||||
#define BASEDIRNAME "quake" // assumed to have a 2 or 3 following
|
||||
#define HERETIC2_BASEDIRNAME "h"
|
||||
#define PATHSEPERATOR '/'
|
||||
|
|
|
|||
|
|
@ -212,7 +212,7 @@ void Cmd_File( void ){
|
|||
|
||||
===============
|
||||
*/
|
||||
#ifdef _WIN32
|
||||
#ifdef WIN32
|
||||
#include "io.h"
|
||||
void PackDirectory_r( char *dir ){
|
||||
struct _finddata_t fileinfo;
|
||||
|
|
@ -248,11 +248,7 @@ void PackDirectory_r( char *dir ){
|
|||
#include <sys/dir.h>
|
||||
|
||||
void PackDirectory_r( char *dir ){
|
||||
#ifdef NeXT
|
||||
struct direct **namelist, *ent;
|
||||
#else
|
||||
struct dirent **namelist, *ent;
|
||||
#endif
|
||||
int count;
|
||||
struct stat st;
|
||||
int i;
|
||||
|
|
|
|||
|
|
@ -36,10 +36,6 @@
|
|||
#include <unistd.h>
|
||||
#endif
|
||||
|
||||
#ifdef NeXT
|
||||
#include <libc.h>
|
||||
#endif
|
||||
|
||||
#define BASEDIRNAME "h"
|
||||
#define PATHSEPERATOR '/'
|
||||
|
||||
|
|
|
|||
|
|
@ -202,7 +202,7 @@ void Cmd_File( void ){
|
|||
|
||||
===============
|
||||
*/
|
||||
#ifdef _WIN32
|
||||
#ifdef WIN32
|
||||
#include "io.h"
|
||||
void PackDirectory_r( char *dir ){
|
||||
struct _finddata_t fileinfo;
|
||||
|
|
@ -235,18 +235,10 @@ void PackDirectory_r( char *dir ){
|
|||
#else
|
||||
|
||||
#include <sys/types.h>
|
||||
#ifdef NeXT
|
||||
#include <sys/dir.h>
|
||||
#else
|
||||
#include <dirent.h>
|
||||
#endif
|
||||
|
||||
void PackDirectory_r( char *dir ){
|
||||
#ifdef NeXT
|
||||
struct direct **namelist, *ent;
|
||||
#else
|
||||
struct dirent **namelist, *ent;
|
||||
#endif
|
||||
int count;
|
||||
struct stat st;
|
||||
int i;
|
||||
|
|
|
|||
|
|
@ -43,10 +43,6 @@
|
|||
#include <unistd.h>
|
||||
#endif
|
||||
|
||||
#ifdef NeXT
|
||||
#include <libc.h>
|
||||
#endif
|
||||
|
||||
#define BASEDIRNAME "quake" // assumed to have a 2 or 3 following
|
||||
|
||||
#ifdef SAFE_MALLOC
|
||||
|
|
|
|||
|
|
@ -289,7 +289,7 @@ void Cmd_File( void ){
|
|||
|
||||
===============
|
||||
*/
|
||||
#ifdef _WIN32
|
||||
#ifdef WIN32
|
||||
#include "io.h"
|
||||
void PackDirectory_r( char *dir ){
|
||||
struct _finddata_t fileinfo;
|
||||
|
|
@ -322,18 +322,10 @@ void PackDirectory_r( char *dir ){
|
|||
#else
|
||||
|
||||
#include <sys/types.h>
|
||||
#ifndef WIN32
|
||||
#include <sys/dir.h>
|
||||
#else
|
||||
#include <sys/dirent.h>
|
||||
#endif
|
||||
|
||||
void PackDirectory_r( char *dir ){
|
||||
#ifdef NeXT
|
||||
struct direct **namelist, *ent;
|
||||
#else
|
||||
struct dirent **namelist, *ent;
|
||||
#endif
|
||||
int count;
|
||||
struct stat st;
|
||||
int i;
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user