[frontierkernel-commits] Frontier/Common/SystemHeaders standard.h,1.2,1.3

[Andre R. <and...@us...>]

Update of /cvsroot/frontierkernel/Frontier/Common/SystemHeaders
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19548

Modified Files:
	standard.h 
Log Message:
Merge some definitions from standard.h into frontier.h that are specific to the Win32 build.

Index: standard.h
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/SystemHeaders/standard.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** standard.h	23 Oct 2004 19:23:47 -0000	1.2
--- standard.h	24 Oct 2004 12:29:31 -0000	1.3
***************
*** 31,51 ****
  #define standardinclude /*so other modules can tell that we've been included*/
  
- #define PASCALSTRINGVERSION 1
- #define SPEED 1
- 
  #ifdef WIN95VERSION
- 	#ifndef __MWERKS__
- 		#pragma warning (disable: 4244 4761; error: 4013)
- 		#include "shell.msvs.h"
- 	#endif
- 	#define NEWFILESPECTYPE 1	
  	#include "macconv.h"
- #elif defined (MACVERSION)
- 	
- #else
- 	#pragma error "must define MACVERSION or WIN95VERSION"
  #endif
  
- 
  #ifdef PACKFLIPPED
  	#define conditionallongswap(x) dolongswap(x)
--- 31,38 ----