[frontierkernel-commits] Frontier/Common/SystemHeaders SetUpA5.h,1.2,1.2.6.1 UserTalk.h,1.1,1.1.6.1 WSE.h,1.1,1.1.6.1 land.h,1.4,1.4.6.1 standard.h,1.5,1.5.6.1 uisharing.h,1.1,1.1.6.1 uisinternal.h,1.1,1.1.6.1

[David B. <dav...@us...>]

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

Modified Files:
      Tag: sidewinder-merge-20050115
	SetUpA5.h UserTalk.h WSE.h land.h standard.h uisharing.h 
	uisinternal.h 
Log Message:
merge from head



Index: uisinternal.h
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/SystemHeaders/uisinternal.h,v
retrieving revision 1.1
retrieving revision 1.1.6.1
diff -C2 -d -r1.1 -r1.1.6.1
*** uisinternal.h	9 Oct 2004 06:18:02 -0000	1.1
--- uisinternal.h	16 Jan 2005 08:07:25 -0000	1.1.6.1
***************
*** 1,3 ****
--- 1,5 ----
  
+ /*	$Id$    */
+ 
  /******************************************************************************
  

Index: standard.h
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/SystemHeaders/standard.h,v
retrieving revision 1.5
retrieving revision 1.5.6.1
diff -C2 -d -r1.5 -r1.5.6.1
*** standard.h	28 Oct 2004 17:22:10 -0000	1.5
--- standard.h	16 Jan 2005 08:07:25 -0000	1.5.6.1
***************
*** 1,3 ****
--- 1,5 ----
  
+ /*	$Id$    */
+ 
  /******************************************************************************
  
***************
*** 35,38 ****
--- 37,44 ----
  #endif
  
+ #ifdef MACVERSION  /* 2005-01-09 SMD - for getmilliseconds */
+ 	#include "FastTimes.h"
+ #endif
+ 
  #ifdef PACKFLIPPED
  	#define conditionallongswap(x) dolongswap(x)
***************
*** 268,272 ****
--- 274,282 ----
  typedef boolean (*callback) (void); /* 2004-10-24 aradke: was ... instead of void on Mac */
  
+ #if defined(__RPCNDR_H_VERSION__)
+ typedef	unsigned char *ptrbyte;	/* 2004-12-29 trt: byte defined by Win32 rpcndr.h */
+ #else
  typedef	unsigned char byte, *ptrbyte;	
+ #endif
  
  

Index: SetUpA5.h
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/SystemHeaders/SetUpA5.h,v
retrieving revision 1.2
retrieving revision 1.2.6.1
diff -C2 -d -r1.2 -r1.2.6.1
*** SetUpA5.h	28 Oct 2004 12:29:48 -0000	1.2
--- SetUpA5.h	16 Jan 2005 08:07:24 -0000	1.2.6.1
***************
*** 1,3 ****
--- 1,5 ----
  
+ /*	$Id$    */
+ 
  /******************************************************************************
  

Index: uisharing.h
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/SystemHeaders/uisharing.h,v
retrieving revision 1.1
retrieving revision 1.1.6.1
diff -C2 -d -r1.1 -r1.1.6.1
*** uisharing.h	9 Oct 2004 06:17:55 -0000	1.1
--- uisharing.h	16 Jan 2005 08:07:25 -0000	1.1.6.1
***************
*** 1,3 ****
--- 1,5 ----
  
+ /*	$Id$    */
+ 
  /******************************************************************************
  

Index: UserTalk.h
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/SystemHeaders/UserTalk.h,v
retrieving revision 1.1
retrieving revision 1.1.6.1
diff -C2 -d -r1.1 -r1.1.6.1
*** UserTalk.h	9 Oct 2004 06:18:09 -0000	1.1
--- UserTalk.h	16 Jan 2005 08:07:25 -0000	1.1.6.1
***************
*** 1,3 ****
--- 1,5 ----
  
+ /*	$Id$    */
+ 
  /******************************************************************************
  

Index: WSE.h
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/SystemHeaders/WSE.h,v
retrieving revision 1.1
retrieving revision 1.1.6.1
diff -C2 -d -r1.1 -r1.1.6.1
*** WSE.h	9 Oct 2004 06:18:17 -0000	1.1
--- WSE.h	16 Jan 2005 08:07:25 -0000	1.1.6.1
***************
*** 1,2 ****
--- 1,5 ----
+ 
+ /*	$Id$    */
+ 
  /* Word Solution 2.01 Header File for "C"
      ©1993 by DataPak Software, Inc.   */

Index: land.h
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/SystemHeaders/land.h,v
retrieving revision 1.4
retrieving revision 1.4.6.1
diff -C2 -d -r1.4 -r1.4.6.1
*** land.h	29 Oct 2004 20:59:57 -0000	1.4
--- land.h	16 Jan 2005 08:07:25 -0000	1.4.6.1
***************
*** 1,3 ****
--- 1,5 ----
  
+ /*	$Id$    */
+ 
  /******************************************************************************