diff options
| author | olli <olli@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2007-02-08 09:25:53 +0000 |
|---|---|---|
| committer | olli <olli@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2007-02-08 09:25:53 +0000 |
| commit | 80eb545262f2ea57e5d0620251e71d60cc53cb78 (patch) | |
| tree | 0a718b6e894d6dd29512336fe5efc8088d0c9271 | |
| parent | 9f36f082ca97d3850eea4c90b6798073406177ab (diff) | |
| download | ATCD-80eb545262f2ea57e5d0620251e71d60cc53cb78.tar.gz | |
ChangeLogTag: Thu Feb 8 09:23:50 UTC 2007 Olli Savia <ops@iki.fi>
| -rw-r--r-- | ACE/ChangeLog | 8 | ||||
| -rw-r--r-- | ACE/ace/MMAP_Memory_Pool.cpp | 5 | ||||
| -rw-r--r-- | ACE/include/makeinclude/platform_linux.GNU | 8 |
3 files changed, 15 insertions, 6 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index eacf2b11000..14f563a2e17 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,11 @@ +Thu Feb 8 09:23:50 UTC 2007 Olli Savia <ops@iki.fi> + + * ace/MMAP_Memory_Pool.cpp: + Removed empty else statement. + + * include/makeinclude/platform_linux.GNU: + Fixed TCL/TK settings + Thu Feb 8 08:03:57 UTC 2007 Olli Savia <ops@iki.fi> * ace/config-openbsd.h: diff --git a/ACE/ace/MMAP_Memory_Pool.cpp b/ACE/ace/MMAP_Memory_Pool.cpp index 2be726393e4..dd72b985e30 100644 --- a/ACE/ace/MMAP_Memory_Pool.cpp +++ b/ACE/ace/MMAP_Memory_Pool.cpp @@ -470,9 +470,10 @@ ACE_MMAP_Memory_Pool::handle_signal (int signum, siginfo_t *siginfo, ucontext_t { if (signum != SIGSEGV) return -1; +#if 0 else - ; // ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("(%P|%t) received %S\n"), signum)); - + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("(%P|%t) received %S\n"), signum)); +#endif // ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("(%P|%t) new mapping address = %u\n"), (char *) this->base_addr_ + current_map_size)); #if defined (ACE_HAS_SIGINFO_T) && !defined (ACE_LACKS_SI_ADDR) diff --git a/ACE/include/makeinclude/platform_linux.GNU b/ACE/include/makeinclude/platform_linux.GNU index 86a393c1762..5b1963fbfb5 100644 --- a/ACE/include/makeinclude/platform_linux.GNU +++ b/ACE/include/makeinclude/platform_linux.GNU @@ -41,12 +41,12 @@ PLATFORM_BOOST_CPPFLAGS ?= PLATFORM_BOOST_LDLAGS ?= PLATFORM_BOOST_UTF_LIBS ?= -lboost_unit_test_framework -PLATFORM_TCL_CPPFLAGS=-I/usr/include/tcl8.4 -PLATFORM_TCL_LIBS=-ltcl8.4 +PLATFORM_TCL_CPPFLAGS= +PLATFORM_TCL_LIBS=-ltcl PLATFORM_TCL_LDFLAGS= -PLATFORM_TK_CPPFLAGS=-I$(shell . /usr/lib/tk8.4/tkConfig.sh && echo -n $$TK_INC_DIR $$TK_DEFS) -PLATFORM_TK_LIBS=$(shell . /usr/lib/tk8.4/tkConfig.sh && echo -n $$TK_LIB_FLAG) +PLATFORM_TK_CPPFLAGS=-I$(shell . /usr/lib/tkConfig.sh && echo -n $$TK_INC_DIR $$TK_DEFS) +PLATFORM_TK_LIBS=$(shell . /usr/lib/tkConfig.sh && echo -n $$TK_LIB_FLAG) PLATFORM_TK_LDFLAGS= PLATFORM_AIO_SUPPORT := \ |