From 7ad7f1f4d17f79a198057067f13c993d39cf1868 Mon Sep 17 00:00:00 2001 From: Hugo Villeneuve Date: Wed, 6 Jul 2005 02:28:19 +0000 Subject: [PATCH] Removed no more used hv-debug macro Cleaned-up header files --- Makefile.am | 1 - config/hv-debug.m4 | 18 ------------------ configure.in | 9 --------- src/dockapp.c | 10 ++++++++++ src/dockapp.h | 9 --------- src/xevents.c | 4 ++++ src/xevents.h | 4 ---- 7 files changed, 14 insertions(+), 41 deletions(-) delete mode 100644 config/hv-debug.m4 diff --git a/Makefile.am b/Makefile.am index 5c0c165..c65afe8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,7 +7,6 @@ SUBDIRS = src doc ## we want these in the dist tarball EXTRA_DIST = autogen.sh \ $(ac_aux_dir)/acx_pthread.m4 \ - $(ac_aux_dir)/hv-debug.m4 \ sound-samples \ pixmaps diff --git a/config/hv-debug.m4 b/config/hv-debug.m4 deleted file mode 100644 index f8fc330..0000000 --- a/config/hv-debug.m4 +++ /dev/null @@ -1,18 +0,0 @@ -dnl -dnl Macro for adding an option to 'configure' for enabling debugging messages -dnl -AC_DEFUN([HV_CHECK_FOR_DEBUG],[ -AC_ARG_ENABLE(debug, AC_HELP_STRING([--enable-debug], - [enable debugging messages on console - (default is NO)]),[ - if test x"${enableval}" = xyes; then - debug_messages=1 - AC_DEFINE([DEBUG],1,[Set to 1 to enable debugging messages.]) - elif test x"${enableval}" = xno; then - debug_messages=0 - else - AC_MSG_ERROR(bad value for --enable-debug option) - fi -], debug_messages=0 ) -]) - diff --git a/configure.in b/configure.in index c99f352..15b67ff 100644 --- a/configure.in +++ b/configure.in @@ -23,9 +23,6 @@ AC_C_CONST AC_TYPE_PID_T AC_TYPE_SIZE_T -dnl Checks for '--enable-debug' option -HV_CHECK_FOR_DEBUG - dnl Basic CFLAGS values CFLAGS="${CFLAGS} -Wall" @@ -110,12 +107,6 @@ echo " Compiler: ${CC}" echo " Compiler flags: ${CFLAGS}" echo " Linker flags: ${LIBS}" echo -echo -n " Debugging: " -if test x"${debug_messages}" = x1; then - echo "yes" -else - echo "no" -fi echo " OpenSSL: $ac_cv_enable_ssl" echo " libsndfile: $ac_cv_enable_libsndfile" diff --git a/src/dockapp.c b/src/dockapp.c index 01bd329..9f8994b 100644 --- a/src/dockapp.c +++ b/src/dockapp.c @@ -19,6 +19,16 @@ #include "dockapp.h" +#define XLIB_FAILURE 0 +#define XLIB_SUCCESS 1 + +/* Specifies the border width */ +#define BWIDTH 1 + +/* Width and height in pixels of Window Maker icons. */ +#define ICON_SIZE 64 + + static void CreateIconFromXpmData( char *pixmap_data[] ) { diff --git a/src/dockapp.h b/src/dockapp.h index c278b66..39fde8c 100644 --- a/src/dockapp.h +++ b/src/dockapp.h @@ -7,15 +7,6 @@ #include -#define XLIB_FAILURE 0 -#define XLIB_SUCCESS 1 - -/* Specifies the border width */ -#define BWIDTH 1 - -/* Width and height in pixels of Window Maker icons. */ -#define ICON_SIZE 64 - typedef struct XpmIcon { XpmAttributes attributes; diff --git a/src/xevents.c b/src/xevents.c index c9b66f6..4ff17df 100644 --- a/src/xevents.c +++ b/src/xevents.c @@ -22,6 +22,10 @@ #include "xevents.h" +/* Maximum time between mouse double-clicks, in milliseconds */ +#define DOUBLE_CLICK_MAX_INTERVAL_MS 250 + + /* Function pointers to handle single and double mouse click events. */ static void (*SingleClickCallback)( void ) = NULL; diff --git a/src/xevents.h b/src/xevents.h index 856a955..2562395 100644 --- a/src/xevents.h +++ b/src/xevents.h @@ -4,10 +4,6 @@ #define XEVENTS_H 1 -/* Maximum time between mouse double-clicks, in milliseconds */ -#define DOUBLE_CLICK_MAX_INTERVAL_MS 250 - - void AudibleBeep( void ); -- 2.20.1