[frontierkernel-commits] Frontier/Common/source db.c,1.4,1.5 odbengine.c,1.3,1.4 cancoon.c,1.3,1.4

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

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

Modified Files:
	db.c odbengine.c cancoon.c 
Log Message:
Fixed Xcode/ld linker warning about doubly defined symbol _dbopen (from db.c and System.framework) by renaming our dbopen to dbopenfile.

Index: odbengine.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/odbengine.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** odbengine.c	31 Oct 2004 17:59:48 -0000	1.3
--- odbengine.c	1 Nov 2004 12:21:31 -0000	1.4
***************
*** 507,511 ****
  	#endif
  	
! 	if (!dbopen (fnum, flreadonly))
  		return (false);
  	
--- 507,511 ----
  	#endif
  	
! 	if (!dbopenfile (fnum, flreadonly))
  		return (false);
  	
***************
*** 522,526 ****
  	hc = cancoonglobals;
  	
! 	(**hc).hdatabase = databasedata; /*result from dbopen*/
  	
  	switch (versionnumber) {
--- 522,526 ----
  	hc = cancoonglobals;
  	
! 	(**hc).hdatabase = databasedata; /*result from dbopenfile*/
  	
  	switch (versionnumber) {

Index: cancoon.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/cancoon.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** cancoon.c	31 Oct 2004 17:59:48 -0000	1.3
--- cancoon.c	1 Nov 2004 12:21:31 -0000	1.4
***************
*** 771,775 ****
  	cancoondata = nil; /*default error return*/
  	
! 	if (!dbopen (fnum, false))
  		return (false);
  	
--- 771,775 ----
  	cancoondata = nil; /*default error return*/
  	
! 	if (!dbopenfile (fnum, false))
  		return (false);
  	
***************
*** 800,804 ****
  	//(**cancoonwindowinfo).hdata = (Handle) hc; /*link data to window*/
  	
! 	(**hc).hdatabase = databasedata; /*result from dbopen*/
  	
  	switch (versionnumber) {
--- 800,804 ----
  	//(**cancoonwindowinfo).hdata = (Handle) hc; /*link data to window*/
  	
! 	(**hc).hdatabase = databasedata; /*result from dbopenfile*/
  	
  	switch (versionnumber) {

Index: db.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/db.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** db.c	31 Oct 2004 17:59:48 -0000	1.4
--- db.c	1 Nov 2004 12:21:31 -0000	1.5
***************
*** 2486,2490 ****
  	
  
! boolean dbopen (hdlfilenum fnum, boolean flreadonly) {
  	
  	/*
--- 2486,2490 ----
  	
  
! boolean dbopenfile (hdlfilenum fnum, boolean flreadonly) {
  	
  	/*
***************
*** 2573,2577 ****
  	
  	return (false); /*error loading in header*/
! 	} /*dbopen*/
  
  
--- 2573,2577 ----
  	
  	return (false); /*error loading in header*/
! 	} /*dbopenfile*/