From: Andrey C. <sku...@us...> - 2007-01-16 14:23:39
|
Update of /cvsroot/eas-dev/eas/libeas In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv9766/libeas Modified Files: Makefile messagemanager.prg protocol_raw.prg transportmanager.prg uimanager.prg Log Message: check glibc version for build with or without thread support Index: Makefile =================================================================== RCS file: /cvsroot/eas-dev/eas/libeas/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Makefile 20 Nov 2006 12:57:55 -0000 1.2 +++ Makefile 16 Jan 2007 14:23:25 -0000 1.3 @@ -42,4 +42,4 @@ dist: distclean .prg.o: clip-ui.ch - $(CLIP) $(CLIPFLAGS) $(CLIPINCLUDE) $(EASDEF) $< + $(CLIP) $(CLIPFLAGS)$(THREAD) $(CLIPINCLUDE) $(EASDEF) $< Index: messagemanager.prg =================================================================== RCS file: /cvsroot/eas-dev/eas/libeas/messagemanager.prg,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- messagemanager.prg 15 Nov 2006 10:37:18 -0000 1.3 +++ messagemanager.prg 16 Jan 2007 14:23:25 -0000 1.4 @@ -118,8 +118,10 @@ ret := map() ret:error := self:exec:lastError - // Pass error to administrator - lcomponent( "errorlog", "add", "error", ret:error ) + if ret:error != "Method 'add' of component 'errorlog' was not found" + // Pass error to administrator + lcomponent( "errorlog", "add", "error", ret:error ) + endif endif Index: protocol_raw.prg =================================================================== RCS file: /cvsroot/eas-dev/eas/libeas/protocol_raw.prg,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- protocol_raw.prg 15 Nov 2006 10:37:18 -0000 1.5 +++ protocol_raw.prg 16 Jan 2007 14:23:25 -0000 1.6 @@ -114,7 +114,11 @@ if (session := tcpAccept( self:socket:handle, self:socket:aTimeOut )) != -1 // Create new session eDebug( 26, "Start new session: ", session) +#ifdef SINGLE_CONNECTION + threadId := session_open(self, session) // Begin session +#else threadId := start(@session_open(), self, session) // Begin new thread +#endif eDebug( 26, "Ready for new connection") endif sleep(0.01) Index: transportmanager.prg =================================================================== RCS file: /cvsroot/eas-dev/eas/libeas/transportmanager.prg,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- transportmanager.prg 20 Nov 2006 12:57:55 -0000 1.4 +++ transportmanager.prg 16 Jan 2007 14:23:25 -0000 1.5 @@ -119,7 +119,11 @@ // Open each connection for c in self:connections oCurConn := c +#ifdef SINGLE_CONNECTION + threadId := connection_open() // Begin connection +#else threadId := start( @connection_open() ) // Begin thread for each connection +#endif next // Infinity loop for child thread Index: uimanager.prg =================================================================== RCS file: /cvsroot/eas-dev/eas/libeas/uimanager.prg,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- uimanager.prg 20 Nov 2006 12:57:55 -0000 1.5 +++ uimanager.prg 16 Jan 2007 14:23:25 -0000 1.6 @@ -320,7 +320,7 @@ return NIL endif - if params:window:isChanged() // TODO: i18n is needed! + if params:window:isChanged() dlg := params:window:dialogBox(i18n("Document was changed"), ; i18n("There are unsaved changes in current document.&\nSave changes?"), ; i18n("'&Save','&Discard','&Cancel'"), ; |