From 512ebbafa4666521b5a8acef939e89dcec6e2643 Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Sun, 5 May 2002 10:54:34 +0000 Subject: [PATCH] r1948: *** empty log message *** --- config.h.in | 12 -- configure | 248 ------------------------------------ include/ctglobals.h | 7 +- libctsupport/globalvars.cpp | 4 +- libctsupport/syserror.cpp | 5 +- src/ctsim.h | 6 +- 6 files changed, 6 insertions(+), 276 deletions(-) diff --git a/config.h.in b/config.h.in index a955015..2b395ab 100644 --- a/config.h.in +++ b/config.h.in @@ -12,9 +12,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_CTYPE_H -/* x dbe support */ -#undef HAVE_DBE_SUPPORT - /* dmalloc library */ #undef HAVE_DMALLOC @@ -48,9 +45,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_MATH_H -/* x mbx support */ -#undef HAVE_MBX_SUPPORT - /* Define to 1 if you have the header file. */ #undef HAVE_MEMORY_H @@ -150,12 +144,6 @@ /* X11 system */ #undef HAVE_X11 -/* Define to 1 if you have the header file. */ -#undef HAVE_X11_EXTENSIONS_MULTIBUF_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_X11_EXTENSIONS_XDBE_H - /* no debugging */ #undef NDEBUG diff --git a/configure b/configure index 843687c..de7ee10 100755 --- a/configure +++ b/configure @@ -8833,254 +8833,6 @@ fi LDFLAGS="$our_saved_LDFLAGS" -our_saved_LDFLAGS="$LDFLAGS" -LDFLAGS="$X_LIBS $LDFLAGS" -echo "$as_me:$LINENO: checking for XdbeQueryExtension in -lXext" >&5 -echo $ECHO_N "checking for XdbeQueryExtension in -lXext... $ECHO_C" >&6 -if test "${ac_cv_lib_Xext_XdbeQueryExtension+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lXext -lX11 "$X_EXTRA_LIBS" $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -#include "confdefs.h" - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char XdbeQueryExtension (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif -int -main () -{ -XdbeQueryExtension (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_Xext_XdbeQueryExtension=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_Xext_XdbeQueryExtension=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_Xext_XdbeQueryExtension" >&5 -echo "${ECHO_T}$ac_cv_lib_Xext_XdbeQueryExtension" >&6 -if test $ac_cv_lib_Xext_XdbeQueryExtension = yes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_DBE_SUPPORT 1 -_ACEOF - -fi - -echo "$as_me:$LINENO: checking for XmbufQueryExtension in -lXext" >&5 -echo $ECHO_N "checking for XmbufQueryExtension in -lXext... $ECHO_C" >&6 -if test "${ac_cv_lib_Xext_XmbufQueryExtension+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lXext -lX11 "$X_EXTRA_LIBS" $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -#include "confdefs.h" - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char XmbufQueryExtension (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif -int -main () -{ -XmbufQueryExtension (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_Xext_XmbufQueryExtension=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_Xext_XmbufQueryExtension=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_Xext_XmbufQueryExtension" >&5 -echo "${ECHO_T}$ac_cv_lib_Xext_XmbufQueryExtension" >&6 -if test $ac_cv_lib_Xext_XmbufQueryExtension = yes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_MBX_SUPPORT 1 -_ACEOF - -fi - -LDFLAGS="$our_saved_LDFLAGS" -our_saved_CPPFLAGS="$CPPFLAGS" -CPPFLAGS="$X_CFLAGS $CPPFLAGS" - - -for ac_header in X11/extensions/Xdbe.h X11/extensions/multibuf.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -else - # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -#include "confdefs.h" -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_header_compiler=no -fi -rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 - -# Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -#include "confdefs.h" -#include <$ac_header> -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - ac_header_preproc=no -fi -rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc in - yes:no ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; - no:yes ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; -esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=$ac_header_preproc" -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 - -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - -CPPFLAGS="$our_saved_CPPFLAGS" - if test "x$no_x" = "xyes"; then diff --git a/include/ctglobals.h b/include/ctglobals.h index 4c9b724..4615774 100644 --- a/include/ctglobals.h +++ b/include/ctglobals.h @@ -9,7 +9,7 @@ ** This is part of the CTSim program ** Copyright (c) 1983-2001 Kevin Rosenberg ** -** $Id: ctglobals.h,v 1.5 2001/11/22 16:43:26 kevin Exp $ +** $Id: ctglobals.h,v 1.6 2002/05/05 10:54:34 kevin Exp $ ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License (version 2) as @@ -29,11 +29,6 @@ #ifndef __CTGLOBALS_H #define __CTGLOBALS_H -#ifdef HAVE_WXWINDOWS -class CTSimApp; -extern CTSimApp* theApp; -#endif - extern bool g_bRunningWXWindows; // variable defined in syserror.cpp #endif diff --git a/libctsupport/globalvars.cpp b/libctsupport/globalvars.cpp index d893dba..ad6261c 100644 --- a/libctsupport/globalvars.cpp +++ b/libctsupport/globalvars.cpp @@ -9,7 +9,7 @@ ** This is part of the CTSim program ** Copyright (c) 1983-2001 Kevin Rosenberg ** -** $Id: globalvars.cpp,v 1.1 2002/05/05 10:13:13 kevin Exp $ +** $Id: globalvars.cpp,v 1.2 2002/05/05 10:54:34 kevin Exp $ ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License (version 2) as @@ -32,7 +32,7 @@ #include "../src/ctsim.h" bool g_bRunningWXWindows = false; -class CTSimApp* theApp = NULL; +CTSimApp* theApp = NULL; #endif diff --git a/libctsupport/syserror.cpp b/libctsupport/syserror.cpp index b874f07..0823ea2 100644 --- a/libctsupport/syserror.cpp +++ b/libctsupport/syserror.cpp @@ -2,7 +2,7 @@ ** This is part of the CTSim program ** Copyright (c) 1983-2001 Kevin Rosenberg ** -** $Id: syserror.cpp,v 1.22 2001/02/27 03:59:30 kevin Exp $ +** $Id: syserror.cpp,v 1.23 2002/05/05 10:54:34 kevin Exp $ ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License (version 2) as @@ -38,7 +38,6 @@ * int severity Severity of error * char *msg Error message * args Argument list, direct transfer to printf stack -* Can take 24 byte transfer */ static int s_reportErrorLevel = ERR_TRACE; // Set error reporting level @@ -60,7 +59,7 @@ void sys_error (int severity, const char *msg, ...) wxString msg (strOutput.c_str()); msg += "\n"; eventLog.SetString( msg ); - wxPostEvent( theApp->getMainFrame(), eventLog ); // send log event, thread safe + // wxPostEvent( theApp->getMainFrame(), eventLog ); // send log event, thread safe } else { wxMutexGuiEnter(); wxLog::OnLog (wxLOG_Message, strOutput.c_str(), time(NULL)); diff --git a/src/ctsim.h b/src/ctsim.h index f2d70bb..9895231 100644 --- a/src/ctsim.h +++ b/src/ctsim.h @@ -9,7 +9,7 @@ ** This is part of the CTSim program ** Copyright (c) 1983-2001 Kevin Rosenberg ** -** $Id: ctsim.h,v 1.63 2001/09/24 11:20:08 kevin Exp $ +** $Id: ctsim.h,v 1.64 2002/05/05 10:54:34 kevin Exp $ ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License (version 2) as @@ -37,9 +37,6 @@ #ifdef MSVC #define HAVE_WXTHREADS 1 -#else -#undef HAVE_WXTHREADS -#define HAVE_WXTHREADS 1 #endif #ifndef WX_PRECOMP @@ -282,7 +279,6 @@ public: }; DECLARE_APP(CTSimApp) - extern class CTSimApp* theApp; enum { -- 2.34.1