[frontierkernel-commits] Frontier/Common/headers CallMachOFrameWork.h,1.3,1.3.2.1 langdll.h,1.1,1.1.2.1 ops.h,1.2,1.2.2.1 versions.h,1.2.2.1,1.2.2.2

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

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

Modified Files:
      Tag: New_Tables_Experiment-branch
	CallMachOFrameWork.h langdll.h ops.h versions.h 
Log Message:
merged trunk, from merged-Root-of-New_Tables_Experiment to HEAD (conflicts resovled)

Index: langdll.h
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/langdll.h,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
*** langdll.h	9 Oct 2004 20:57:10 -0000	1.1
--- langdll.h	1 Dec 2004 19:44:44 -0000	1.1.2.1
***************
*** 75,79 ****
  odbBool xCALLBACK extThreadSleep (long sleepticks); /* 2003-04-22 AR */
  
! extern void fillcalltable (XDLLProcTable * calltable);
  
  extern boolean dllisloadedverb (hdltreenode hparam1, tyvaluerecord *vreturned);
--- 75,81 ----
  odbBool xCALLBACK extThreadSleep (long sleepticks); /* 2003-04-22 AR */
  
! extern void dllinitverbs (void); /*2004-11-29 aradke*/
! 
! extern void fillcalltable (XDLLProcTable *);
  
  extern boolean dllisloadedverb (hdltreenode hparam1, tyvaluerecord *vreturned);

Index: ops.h
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/ops.h,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -d -r1.2 -r1.2.2.1
*** ops.h	30 Oct 2004 23:50:16 -0000	1.2
--- ops.h	1 Dec 2004 19:44:44 -0000	1.2.2.1
***************
*** 109,110 ****
--- 109,111 ----
  extern void getsizestring (unsigned long, bigstring);
  
+ extern unsigned long bcdtolong (unsigned long); /* 2004-11-16 creedon */
\ No newline at end of file

Index: versions.h
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/versions.h,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C2 -d -r1.2.2.1 -r1.2.2.2
*** versions.h	13 Nov 2004 16:02:25 -0000	1.2.2.1
--- versions.h	1 Dec 2004 19:44:44 -0000	1.2.2.2
***************
*** 33,48 ****
  
  
! #define	radio_major_version				8
! #define	radio_major_version_bcd			0x08 	/* major version in BCD notation */
  
! #define	radio_sub_version				1
  #define	radio_minor_version				0
! #define	radio_subminor_version_bcd		0x10  	/* sub and minor version in BCD notation */
  
! #define radio_stage_code				0x60	/* dev = 0x20, alpha = 0x40, beta = 0x60, final = 0x80 */
  #define	radio_revision_level			4		/* for non-final releases only */
  #define	radio_build_number				4		/* increment by one for every release, final or not */
  
! #define radio_version_string			"8.1b4"
  
  
--- 33,48 ----
  
  
! #define	radio_major_version				10
! #define	radio_major_version_bcd			0x10 	/* major version in BCD notation */
  
! #define	radio_sub_version				0
  #define	radio_minor_version				0
! #define	radio_subminor_version_bcd		0x00  	/* sub and minor version in BCD notation */
  
! #define radio_stage_code				0x40	/* dev = 0x20, alpha = 0x40, beta = 0x60, final = 0x80 */
  #define	radio_revision_level			4		/* for non-final releases only */
  #define	radio_build_number				4		/* increment by one for every release, final or not */
  
! #define radio_version_string			"10.0a4"
  
  
***************
*** 55,62 ****
  
  #define frontier_stage_code				0x40	/* dev = 0x20, alpha = 0x40, beta = 0x60, final = 0x80 */
! #define	frontier_revision_level			3		/* for non-final releases only */
! #define	frontier_build_number			3		/* increment by one for every release, final or not */
  
! #define frontier_version_string			"10.0a3"
  
  
--- 55,62 ----
  
  #define frontier_stage_code				0x40	/* dev = 0x20, alpha = 0x40, beta = 0x60, final = 0x80 */
! #define	frontier_revision_level			4		/* for non-final releases only */
! #define	frontier_build_number			4		/* increment by one for every release, final or not */
  
! #define frontier_version_string			"10.0a4"
  
  

Index: CallMachOFrameWork.h
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/CallMachOFrameWork.h,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -d -r1.3 -r1.3.2.1
*** CallMachOFrameWork.h	31 Oct 2004 20:41:23 -0000	1.3
--- CallMachOFrameWork.h	1 Dec 2004 19:44:44 -0000	1.3.2.1
***************
*** 28,32 ****
--- 28,41 ----
  
  extern boolean unixshellcall (Handle hcommand, Handle hreturn);
+ 
  extern OSStatus LoadFrameworkBundle(CFStringRef framework, CFBundleRef *bundlePtr);
  
+ extern void *convertcfmtomachofuncptr (void *);
+ 
+ extern void disposemachofuncptr (void *);
+ 
+ extern void *convertmachotocfmfuncptr (void *);
+ 
+ extern void disposecfmfuncptr (void *);
+ 
  #endif