philip points out precompiled.h -> string_s.h includes posix.h - too heavy for the PCH
replaced that with posix_types.h, which now defines size_t. this change exposed a lot of code that relied on posix.h being included implicitly; fixed those as well. This was SVN commit r2015.
This commit is contained in:
parent
475dfb2c78
commit
468657479c
@ -3,6 +3,10 @@
|
||||
// included from lib/types.h in place of posix.h; this helps avoid conflicts
|
||||
// due to incompatible winsock definitions.
|
||||
|
||||
#include <wchar.h>
|
||||
#include <sys/types.h>
|
||||
#include <stddef.h>
|
||||
|
||||
#ifdef _WIN32
|
||||
# include "sysdep/win/wposix_types.h"
|
||||
#else
|
||||
|
@ -1,7 +1,7 @@
|
||||
#ifndef STRINGS_S_H__
|
||||
#define STRINGS_S_H__
|
||||
|
||||
#include "posix.h" // size_t
|
||||
#include "posix_types.h" // size_t
|
||||
|
||||
// these are already shipped with VC2005
|
||||
#if _MSC_VER < 1400
|
||||
|
@ -19,8 +19,9 @@
|
||||
|
||||
#ifdef _M_IX86
|
||||
|
||||
#include "ia32.h"
|
||||
#include "lib.h"
|
||||
#include "posix.h"
|
||||
#include "ia32.h"
|
||||
#include "detect.h"
|
||||
#include "timer.h"
|
||||
|
||||
|
@ -19,7 +19,7 @@
|
||||
#include "precompiled.h"
|
||||
|
||||
#include "lib.h"
|
||||
#include "waio.h"
|
||||
#include "posix.h"
|
||||
#include "win_internal.h"
|
||||
|
||||
#include <assert.h>
|
||||
|
@ -19,6 +19,7 @@
|
||||
#include "precompiled.h"
|
||||
|
||||
#include "lib.h"
|
||||
#include "posix.h"
|
||||
#include "win_internal.h"
|
||||
|
||||
#include "sysdep/cpu.h"
|
||||
|
@ -18,6 +18,7 @@
|
||||
#include "precompiled.h"
|
||||
|
||||
#include "lib.h"
|
||||
#include "posix.h"
|
||||
#include "win_internal.h"
|
||||
|
||||
#include <crtdbg.h> // malloc debug
|
||||
|
@ -21,6 +21,7 @@
|
||||
#include "precompiled.h"
|
||||
|
||||
#include "lib.h"
|
||||
#include "posix.h"
|
||||
#include "win_internal.h"
|
||||
|
||||
#include <assert.h>
|
||||
|
@ -24,11 +24,9 @@
|
||||
#ifndef __WPOSIX_H__
|
||||
#define __WPOSIX_H__
|
||||
|
||||
#include <wchar.h> // for the stat struct
|
||||
#include <sys/types.h>
|
||||
#include <stddef.h>
|
||||
|
||||
// split out of this module.
|
||||
#include "wposix_types.h"
|
||||
#include "waio.h"
|
||||
#include "wsock.h"
|
||||
#include "wtime.h"
|
||||
|
@ -23,8 +23,8 @@
|
||||
#include <process.h>
|
||||
|
||||
#include "lib.h"
|
||||
#include "posix.h"
|
||||
#include "win_internal.h"
|
||||
#include "wpthread.h"
|
||||
|
||||
|
||||
static HANDLE pthread_t_to_HANDLE(pthread_t p)
|
||||
|
@ -31,6 +31,7 @@
|
||||
|
||||
#include "sdl.h"
|
||||
#include "lib.h"
|
||||
#include "posix.h"
|
||||
#include "win_internal.h"
|
||||
|
||||
#include "ogl.h" // needed to pull in the delay-loaded opengl32.dll
|
||||
|
@ -18,6 +18,7 @@
|
||||
#include "precompiled.h"
|
||||
|
||||
#include "lib.h"
|
||||
#include "posix.h"
|
||||
#include "adts.h"
|
||||
#include "sysdep/ia32.h"
|
||||
#include "detect.h"
|
||||
|
@ -19,6 +19,7 @@
|
||||
#include "precompiled.h"
|
||||
|
||||
#include "lib.h"
|
||||
#include "posix.h"
|
||||
#include "timer.h"
|
||||
#include "adts.h"
|
||||
|
||||
|
@ -67,6 +67,7 @@ CLocker usage 2:
|
||||
//--------------------------------------------------------
|
||||
|
||||
#include "lib.h"
|
||||
#include "posix.h"
|
||||
|
||||
#ifdef DEBUG_LOCKS
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user