hal: Branch 'master'

[Danny Kukawka]

 hald/util.h |    1 -
 1 file changed, 1 deletion(-)

New commits:
commit ec7703996ece6aa53eea002d194384cf419b2796
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Mon Nov 12 19:56:31 2007 +0100

    removed double definition of HAL_HELPER_TIMEOUT
    
    Removed double definition of HAL_HELPER_TIMEOUT in hald/util.h and
    hald/hald_runner.h which could cause problems if one of the both
    values get may changed in the future.
    
    Since the timeout is needed for hald_runner calls removed the
    define from hald/util.h.

diff --git a/hald/util.h b/hald/util.h
index 6a4353a..7530f03 100644
--- a/hald/util.h
+++ b/hald/util.h
@@ -39,7 +39,6 @@
 
 #define HAL_NAME_MAX 256
 #define HAL_PATH_MAX 512
-#define HAL_HELPER_TIMEOUT 10000
 
 gboolean hal_util_remove_trailing_slash (gchar *path);