diff options
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | include/Exceptions.h | 2 | ||||
| -rw-r--r-- | lib/Exceptions.cc | 12 | ||||
| -rw-r--r-- | m4/Makefile | 8 | ||||
| -rw-r--r-- | src/Main.cc | 2 |
5 files changed, 12 insertions, 14 deletions
diff --git a/configure.ac b/configure.ac index d2cebdf..91ea624 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ(2.56) AC_INIT([Baltisot],[0.1.0],[pixel@nobis-crew.org]) -AM_INIT_AUTOMAKE(Balisot, 0.1.0) +AM_INIT_AUTOMAKE(Baltisot, 0.1.0) AC_CONFIG_SRCDIR(src/Main.cc) AM_CONFIG_HEADER(config.h) diff --git a/include/Exceptions.h b/include/Exceptions.h index 4e84bc4..79078e5 100644 --- a/include/Exceptions.h +++ b/include/Exceptions.h @@ -8,8 +8,6 @@ #include <string.h> #include <stdlib.h> -/* #define INLINE __inline__ */ - class Base { public: static char * strdup(const char * s); diff --git a/lib/Exceptions.cc b/lib/Exceptions.cc index 3be7c65..a647f16 100644 --- a/lib/Exceptions.cc +++ b/lib/Exceptions.cc @@ -21,17 +21,17 @@ char GeneralException::t[BUFSIZ]; GeneralException::GeneralException(String emsg) : msg(emsg.strdup()) { #ifdef DEBUG - cerr << _("Generating a General Exception error: '") << msg << "'.\n"; + std::cerr << _("Generating a General Exception error: '") << msg << "'.\n"; #endif } GeneralException::GeneralException() : msg(0) { #ifdef DEBUG - cerr << _("Generating a General Exception error: '") << msg << "'.\n"; + std::cerr << _("Generating a General Exception error: '") << msg << "'.\n"; #endif } GeneralException::GeneralException(const GeneralException & e) : msg(strdup(e.msg)) { #ifdef DEBUG - cerr << _("Generating a General Exception error: '") << msg << "'.\n"; + std::cerr << _("Generating a General Exception error: '") << msg << "'.\n"; #endif } @@ -62,19 +62,19 @@ IOGeneral::IOGeneral() { } IOAgain::IOAgain() : IOGeneral(_("No more bytes for reading or writing.")) { #ifdef DEBUG - cerr << "Generating an IOAgain exception: '" << GetMsg() << "'.\n"; + std::cerr << "Generating an IOAgain exception: '" << GetMsg() << "'.\n"; #endif } TaskSwitch::TaskSwitch() : GeneralException(_("Switching task in a non-tasked environnement")) { #ifdef DEBUG - cerr << "Generating a TaskSwitch exception: '" << GetMsg() << "'.\n"; + std::cerr << "Generating a TaskSwitch exception: '" << GetMsg() << "'.\n"; #endif } Exit::Exit(int a_code) : GeneralException(_("Exitting with code " + a_code)), code(a_code) { #ifdef DEBUG - cerr << "Generating an Exit exception: '" << GetMsg() << "'.\n"; + std::cerr << "Generating an Exit exception: '" << GetMsg() << "'.\n"; #endif } diff --git a/m4/Makefile b/m4/Makefile index 68733a1..f33afba 100644 --- a/m4/Makefile +++ b/m4/Makefile @@ -16,7 +16,7 @@ SHELL = /bin/sh srcdir = . top_srcdir = .. -prefix = /usr +prefix = /usr/local exec_prefix = ${prefix} bindir = ${exec_prefix}/bin @@ -45,7 +45,7 @@ AUTOCONF = autoconf AUTOMAKE = automake-1.4 AUTOHEADER = autoheader -INSTALL = /usr/bin/install -c +INSTALL = /usr/bin/ginstall -c INSTALL_PROGRAM = ${INSTALL} $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = ${INSTALL} -m 644 INSTALL_SCRIPT = ${INSTALL} @@ -99,8 +99,8 @@ USE_INCLUDED_LIBINTL = no USE_NLS = yes VERSION = 0.1.0 YACC = bison -y -gmakepath = -unamepath = /bin/uname +gmakepath = /usr/bin/gmake +unamepath = /usr/bin/uname EXTRA_DIST = intdiv0.m4 inttypes.m4 inttypes_h.m4 inttypes-pri.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 stdint_h.m4 uintmax_t.m4 ulonglong.m4 codeset.m4 gettext.m4 glibc21.m4 iconv.m4 isc-posix.m4 lcmessage.m4 progtest.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff --git a/src/Main.cc b/src/Main.cc index 9f36b56..6566193 100644 --- a/src/Main.cc +++ b/src/Main.cc @@ -148,7 +148,7 @@ Action * buildmenu(void) { return m; } -int startup() { +int startup() throw (GeneralException) { int c; String port = "1500"; |