mirror of
https://github.com/reactos/reactos.git
synced 2024-07-14 08:26:08 +00:00
workarounds for msvc compile. Add precomp.h to a bunch of files, inline -> __inline, other misc changes. crt.lib now has 154 errors building on msvc vs 1800
svn path=/trunk/; revision=19240
This commit is contained in:
parent
96c802c1d3
commit
7adc5ae147
|
@ -1,5 +1,7 @@
|
|||
#include <float.h>
|
||||
|
||||
unsigned int _statusfp( void );
|
||||
|
||||
/*
|
||||
* @implemented
|
||||
*/
|
||||
|
|
|
@ -1,3 +1,4 @@
|
|||
#include "precomp.h"
|
||||
#include <float.h>
|
||||
#include <internal/tls.h>
|
||||
|
||||
|
|
|
@ -34,7 +34,11 @@ unsigned long DbgPrint(char *Format,...);
|
|||
|
||||
|
||||
#ifdef DBG
|
||||
#define DPRINT1(args...) do { DbgPrint("(MSVCRT:%s:%d) ",__FILE__,__LINE__); DbgPrint(args); } while(0);
|
||||
#ifdef __GNUC__
|
||||
#define DPRINT1(args...) do { DbgPrint("(MSVCRT:%s:%d) ",__FILE__,__LINE__); DbgPrint(args); } while(0);
|
||||
#else
|
||||
#define DPRINT1 DbgPrint
|
||||
#endif
|
||||
#define CHECKPOINT1 do { DbgPrint("MSVCRT:%s:%d\n",__FILE__,__LINE__); } while(0);
|
||||
#else
|
||||
#ifdef __GNUC__
|
||||
|
|
|
@ -1,3 +1,4 @@
|
|||
#include "precomp.h"
|
||||
#include <io.h>
|
||||
#include <internal/file.h>
|
||||
|
||||
|
|
|
@ -1,3 +1,5 @@
|
|||
#include "precomp.h"
|
||||
|
||||
#include <internal/file.h>
|
||||
|
||||
#define NDEBUG
|
||||
|
|
|
@ -80,7 +80,7 @@ static int g_fdend = 3; /* highest allocated fd */
|
|||
* INTERNAL
|
||||
*/
|
||||
/*
|
||||
static inline FD_INFO* fdinfo(int fd)
|
||||
static __inline FD_INFO* fdinfo(int fd)
|
||||
{
|
||||
FD_INFO* bucket = __pioinfo[fd >> FDINFO_ENTRIES_PER_BUCKET_SHIFT];
|
||||
if (!bucket){
|
||||
|
@ -94,7 +94,7 @@ static inline FD_INFO* fdinfo(int fd)
|
|||
/*
|
||||
* INTERNAL
|
||||
*/
|
||||
inline BOOL is_valid_fd(int fd)
|
||||
__inline BOOL is_valid_fd(int fd)
|
||||
{
|
||||
BOOL b = (fd >= 0 && fd < g_fdend && (fdinfo(fd)->fdflags & FOPEN));
|
||||
|
||||
|
|
|
@ -8,6 +8,7 @@
|
|||
* UPDATE HISTORY:
|
||||
* 28/12/98: Created
|
||||
*/
|
||||
#include "precomp.h"
|
||||
|
||||
#include <io.h>
|
||||
#include <stdio.h>
|
||||
|
|
|
@ -1,3 +1,5 @@
|
|||
#include "precomp.h"
|
||||
|
||||
#include <stdio.h>
|
||||
#include <io.h>
|
||||
#include <errno.h>
|
||||
|
|
|
@ -30,18 +30,18 @@ typedef struct
|
|||
|
||||
static LOCKTABLEENTRY lock_table[ _TOTAL_LOCKS ];
|
||||
|
||||
static inline void msvcrt_mlock_set_entry_initialized( int locknum, BOOL initialized )
|
||||
static __inline void msvcrt_mlock_set_entry_initialized( int locknum, BOOL initialized )
|
||||
{
|
||||
lock_table[ locknum ].bInit = initialized;
|
||||
}
|
||||
|
||||
static inline void msvcrt_initialize_mlock( int locknum )
|
||||
static __inline void msvcrt_initialize_mlock( int locknum )
|
||||
{
|
||||
InitializeCriticalSection( &(lock_table[ locknum ].crit) );
|
||||
msvcrt_mlock_set_entry_initialized( locknum, TRUE );
|
||||
}
|
||||
|
||||
static inline void msvcrt_uninitialize_mlock( int locknum )
|
||||
static __inline void msvcrt_uninitialize_mlock( int locknum )
|
||||
{
|
||||
DeleteCriticalSection( &(lock_table[ locknum ].crit) );
|
||||
msvcrt_mlock_set_entry_initialized( locknum, FALSE );
|
||||
|
|
|
@ -1 +1,3 @@
|
|||
#define CRT_SECURE_NO_DEPRECATE
|
||||
|
||||
#include <windows.h>
|
||||
|
|
|
@ -1,3 +1,5 @@
|
|||
#include "precomp.h"
|
||||
|
||||
#include <signal.h>
|
||||
#include <stdlib.h>
|
||||
#include <errno.h>
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
/* Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details */
|
||||
#include "precomp.h"
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
/* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */
|
||||
#include "precomp.h"
|
||||
#include <stdio.h>
|
||||
#include <errno.h>
|
||||
#include <internal/file.h>
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/* Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details */
|
||||
|
||||
#include "precomp.h"
|
||||
#include <stdio.h>
|
||||
#include <stdarg.h>
|
||||
#include <io.h>
|
||||
|
|
|
@ -1,14 +1,9 @@
|
|||
|
||||
#include "precomp.h"
|
||||
|
||||
#include <stdio.h>
|
||||
#include <tchar.h>
|
||||
#include <internal/file.h>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
/*
|
||||
* @implemented
|
||||
*/
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
/* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */
|
||||
#include "precomp.h"
|
||||
#include <stdio.h>
|
||||
#include <errno.h>
|
||||
#include <internal/file.h>
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
/* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */
|
||||
#include "precomp.h"
|
||||
#include <stdio.h>
|
||||
#include <internal/file.h>
|
||||
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
/* Copyright (C) 1998 DJ Delorie, see COPYING.DJ for details */
|
||||
/* Copyright (C) 1996 DJ Delorie, see COPYING.DJ for details */
|
||||
/* Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details */
|
||||
|
||||
#include "precomp.h"
|
||||
#include <stdio.h>
|
||||
#include <stdarg.h>
|
||||
#include <errno.h>
|
||||
|
|
|
@ -9,6 +9,7 @@
|
|||
25/02/99: Added fgetwc
|
||||
*/
|
||||
/* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */
|
||||
#include "precomp.h"
|
||||
#include <stdio.h>
|
||||
#include <internal/file.h>
|
||||
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*/
|
||||
/* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */
|
||||
|
||||
#include "precomp.h"
|
||||
#include <stdio.h>
|
||||
#include <internal/file.h>
|
||||
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*/
|
||||
/* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */
|
||||
|
||||
#include "precomp.h"
|
||||
#include <stdio.h>
|
||||
#include <internal/file.h>
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/* Copyright (C) 1997 DJ Delorie, see COPYING.DJ for details */
|
||||
/* Copyright (C) 1996 DJ Delorie, see COPYING.DJ for details */
|
||||
/* Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details */
|
||||
|
||||
#include "precomp.h"
|
||||
#include <stdio.h>
|
||||
#include <sys/types.h>
|
||||
#include <stdlib.h>
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
/* Copyright (C) 1996 DJ Delorie, see COPYING.DJ for details */
|
||||
/* Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details */
|
||||
|
||||
#include "precomp.h"
|
||||
#include <stdio.h>
|
||||
#include <wchar.h>
|
||||
#include <sys/types.h>
|
||||
|
|
|
@ -1,4 +1,6 @@
|
|||
/* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */
|
||||
#include "precomp.h"
|
||||
|
||||
#include <stdio.h>
|
||||
#include <wchar.h>
|
||||
#include <tchar.h>
|
||||
|
|
|
@ -1,4 +1,6 @@
|
|||
/* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */
|
||||
#include "precomp.h"
|
||||
|
||||
#include <stdio.h>
|
||||
#include <wchar.h>
|
||||
#include <internal/file.h>
|
||||
|
|
|
@ -1,3 +1,5 @@
|
|||
#include "precomp.h"
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
|
|
@ -2,6 +2,8 @@
|
|||
/* Copyright (C) 1996 DJ Delorie, see COPYING.DJ for details */
|
||||
/* Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details */
|
||||
|
||||
#include "precomp.h"
|
||||
|
||||
#include <stdio.h>
|
||||
#include <errno.h>
|
||||
#include <fcntl.h>
|
||||
|
|
|
@ -1,4 +1,6 @@
|
|||
/* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */
|
||||
#include "precomp.h"
|
||||
|
||||
#include <stdio.h>
|
||||
#include <errno.h>
|
||||
#include <internal/file.h>
|
||||
|
|
|
@ -1,6 +1,8 @@
|
|||
/* Copyright (C) 1996 DJ Delorie, see COPYING.DJ for details */
|
||||
/* Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details */
|
||||
|
||||
#include "precomp.h"
|
||||
|
||||
#include <stdio.h>
|
||||
#include <fcntl.h>
|
||||
#include <io.h>
|
||||
|
|
|
@ -1,4 +1,6 @@
|
|||
/* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */
|
||||
#include "precomp.h"
|
||||
|
||||
#include <stdio.h>
|
||||
#include <internal/file.h>
|
||||
|
||||
|
|
|
@ -1,3 +1,4 @@
|
|||
#include "precomp.h"
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
|
|
|
@ -23,6 +23,7 @@
|
|||
* License along with this library; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*/
|
||||
#include "precomp.h"
|
||||
|
||||
#include <stdio.h>
|
||||
#include <internal/file.h>
|
||||
|
|
|
@ -8,6 +8,8 @@
|
|||
* UPDATE HISTORY:
|
||||
* 28/12/98: Created
|
||||
*/
|
||||
#include "precomp.h"
|
||||
|
||||
#include <stdio.h>
|
||||
#include <tchar.h>
|
||||
#include <internal/file.h>
|
||||
|
|
|
@ -1,3 +1,5 @@
|
|||
#include "precomp.h"
|
||||
|
||||
#define UNICODE
|
||||
#define _UNICODE
|
||||
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
/* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */
|
||||
#include "precomp.h"
|
||||
|
||||
#include <stdio.h>
|
||||
#include <io.h>
|
||||
|
|
|
@ -8,6 +8,7 @@
|
|||
* Created 19/01/99
|
||||
* NOTE Not tested.
|
||||
*/
|
||||
#include "precomp.h"
|
||||
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
|
|
|
@ -1,4 +1,6 @@
|
|||
/* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */
|
||||
#include "precomp.h"
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <internal/file.h>
|
||||
|
|
|
@ -1,6 +1,8 @@
|
|||
/* Copyright (C) 1998 DJ Delorie, see COPYING.DJ for details */
|
||||
/* Copyright (C) 1996 DJ Delorie, see COPYING.DJ for details */
|
||||
/* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */
|
||||
#include "precomp.h"
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <io.h>
|
||||
|
|
|
@ -18,6 +18,8 @@ License along with the GNU C Library; see the file COPYING.LIB. If
|
|||
not, write to the Free Software Foundation, Inc., 675 Mass Ave,
|
||||
Cambridge, MA 02139, USA. */
|
||||
|
||||
#include "precomp.h"
|
||||
|
||||
#include <stdarg.h>
|
||||
#include <stdio.h>
|
||||
#include <wchar.h>
|
||||
|
|
|
@ -1,4 +1,6 @@
|
|||
/* Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details */
|
||||
#include "precomp.h"
|
||||
|
||||
#include <stdio.h>
|
||||
#include <internal/file.h>
|
||||
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
/* Copyright (C) 1997 DJ Delorie, see COPYING.DJ for details */
|
||||
/* Copyright (C) 1998 DJ Delorie, see COPYING.DJ for details */
|
||||
/* Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details */
|
||||
#include "precomp.h"
|
||||
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
|
|
|
@ -1,5 +1,7 @@
|
|||
/* Copyright (C) 1996 DJ Delorie, see COPYING.DJ for details */
|
||||
/* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */
|
||||
#include "precomp.h"
|
||||
|
||||
#include <stdio.h>
|
||||
#include <wchar.h>
|
||||
#include <errno.h>
|
||||
|
|
|
@ -1,4 +1,6 @@
|
|||
/* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */
|
||||
#include "precomp.h"
|
||||
|
||||
#include <stdarg.h>
|
||||
#include <stdio.h>
|
||||
#include <malloc.h>
|
||||
|
|
|
@ -1,4 +1,6 @@
|
|||
/* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */
|
||||
#include "precomp.h"
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdarg.h>
|
||||
#include <limits.h>
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/* $Id$
|
||||
*
|
||||
*/
|
||||
|
||||
#include "precomp.h"
|
||||
#include <errno.h>
|
||||
#include <internal/tls.h>
|
||||
#include <internal/file.h>
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
/* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */
|
||||
#include "precomp.h"
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <internal/tls.h>
|
||||
|
|
|
@ -1,4 +1,6 @@
|
|||
/* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */
|
||||
#include "precomp.h"
|
||||
|
||||
#include <limits.h>
|
||||
#include <ctype.h>
|
||||
#include <errno.h>
|
||||
|
|
|
@ -1,10 +1,11 @@
|
|||
/* Copyright (C) 1996 DJ Delorie, see COPYING.DJ for details */
|
||||
/* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */
|
||||
#include "precomp.h"
|
||||
|
||||
#include <limits.h>
|
||||
#include <ctype.h>
|
||||
#include <errno.h>
|
||||
#include <stdlib.h>
|
||||
#include <stdint.h>
|
||||
#include <internal/file.h>
|
||||
|
||||
/*
|
||||
|
|
|
@ -16,6 +16,8 @@
|
|||
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
||||
Boston, MA 02111-1307, USA. */
|
||||
|
||||
#include "precomp.h"
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <wchar.h>
|
||||
#include <errno.h>
|
||||
|
|
|
@ -1,3 +1,5 @@
|
|||
#include "precomp.h"
|
||||
|
||||
#include <internal/tls.h>
|
||||
#include <assert.h>
|
||||
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
/* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */
|
||||
#include "precomp.h"
|
||||
|
||||
#include <string.h>
|
||||
#include <internal/tls.h>
|
||||
|
|
|
@ -1,3 +1,5 @@
|
|||
#include "precomp.h"
|
||||
|
||||
#include <malloc.h>
|
||||
#include <stdlib.h>
|
||||
#include <sys/utime.h>
|
||||
|
|
|
@ -12,8 +12,6 @@
|
|||
#include <time.h>
|
||||
#include <internal/file.h>
|
||||
|
||||
VOID STDCALL GetSystemTimeAsFileTime(LPFILETIME lpSystemTimeAsFileTime );
|
||||
|
||||
/*
|
||||
* @implemented
|
||||
*/
|
||||
|
|
|
@ -7,6 +7,8 @@
|
|||
* UPDATE HISTORY:
|
||||
* 28/12/98: Created
|
||||
*/
|
||||
#include "precomp.h"
|
||||
|
||||
#include <time.h>
|
||||
#include <stdio.h>
|
||||
#include <errno.h>
|
||||
|
|
|
@ -7,6 +7,8 @@
|
|||
* UPDATE HISTORY:
|
||||
* 28/12/98: Created
|
||||
*/
|
||||
#include "precomp.h"
|
||||
|
||||
#include <time.h>
|
||||
#include <stdio.h>
|
||||
#include <errno.h>
|
||||
|
|
|
@ -7,6 +7,7 @@
|
|||
* UPDATE HISTORY:
|
||||
* 28/12/98: Created
|
||||
*/
|
||||
#include "precomp.h"
|
||||
#include <time.h>
|
||||
#include <stdio.h>
|
||||
#include <errno.h>
|
||||
|
|
|
@ -7,6 +7,7 @@
|
|||
* UPDATE HISTORY:
|
||||
* 28/12/98: Created
|
||||
*/
|
||||
#include "precomp.h"
|
||||
#include <time.h>
|
||||
#include <stdio.h>
|
||||
#include <errno.h>
|
||||
|
|
|
@ -50,7 +50,7 @@ static DWORD cxx_frame_handler( PEXCEPTION_RECORD rec, cxx_exception_frame* fram
|
|||
int nested_trylevel, CONTEXT86 *context );
|
||||
|
||||
/* call a function with a given ebp */
|
||||
inline static void *call_ebp_func( void *func, void *ebp )
|
||||
__inline static void *call_ebp_func( void *func, void *ebp )
|
||||
{
|
||||
void *ret;
|
||||
__asm__ __volatile__ ("pushl %%ebp; movl %2,%%ebp; call *%%eax; popl %%ebp" \
|
||||
|
@ -59,7 +59,7 @@ inline static void *call_ebp_func( void *func, void *ebp )
|
|||
}
|
||||
|
||||
/* call a copy constructor */
|
||||
inline static void call_copy_ctor( void *func, void *this, void *src, int has_vbase )
|
||||
__inline static void call_copy_ctor( void *func, void *this, void *src, int has_vbase )
|
||||
{
|
||||
TRACE( "calling copy ctor %p object %p src %p\n", func, this, src );
|
||||
if (has_vbase)
|
||||
|
@ -72,7 +72,7 @@ inline static void call_copy_ctor( void *func, void *this, void *src, int has_vb
|
|||
}
|
||||
|
||||
/* call the destructor of the exception object */
|
||||
inline static void call_dtor( void *func, void *object )
|
||||
__inline static void call_dtor( void *func, void *object )
|
||||
{
|
||||
__asm__ __volatile__("call *%0" : : "r" (func), "c" (object) : "eax", "edx", "memory" );
|
||||
}
|
||||
|
@ -261,7 +261,7 @@ static DWORD catch_function_nested_handler( EXCEPTION_RECORD *rec, EXCEPTION_REG
|
|||
|
||||
/* find and call the appropriate catch block for an exception */
|
||||
/* returns the address to continue execution to after the catch block was called */
|
||||
inline static void *call_catch_block( PEXCEPTION_RECORD rec, cxx_exception_frame *frame,
|
||||
__inline static void *call_catch_block( PEXCEPTION_RECORD rec, cxx_exception_frame *frame,
|
||||
cxx_function_descr *descr, int nested_trylevel,
|
||||
cxx_exception_type *info )
|
||||
{
|
||||
|
|
|
@ -33,6 +33,8 @@
|
|||
#include "winternl.h"
|
||||
#include "msvcrt.h"
|
||||
*/
|
||||
#include "precomp.h"
|
||||
|
||||
#define WIN32_NO_STATUS
|
||||
|
||||
#include <stdarg.h>
|
||||
|
|
|
@ -1,3 +1,5 @@
|
|||
#include "precomp.h"
|
||||
|
||||
#include <errno.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
|
|
@ -1,3 +1,5 @@
|
|||
#include "precomp.h"
|
||||
|
||||
#include <string.h>
|
||||
#include <internal/tls.h>
|
||||
|
||||
|
|
|
@ -1,3 +1,5 @@
|
|||
#include "precomp.h"
|
||||
|
||||
#include <internal/tls.h>
|
||||
#include <assert.h>
|
||||
/*
|
||||
|
|
Loading…
Reference in a new issue