start 1.4.9-svn; separate assert messages for clarity

git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@977 7f574dfc-610e-0410-a909-a81674777703

diff --git a/configure.ac.in b/configure.ac.in
index 5dbb72d..8a72238 100644 (file)
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -3,8 +3,8 @@ dnl $Id$
 dnl major, minor and micro version macros.
 m4_define([conky_version_major], [1])
 m4_define([conky_version_minor], [4])
-m4_define([conky_version_micro], [8])
-m4_define([conky_version_tag], []) dnl [] for releases
+m4_define([conky_version_micro], [9])
+m4_define([conky_version_tag], [svn]) dnl [] for releases
 m4_define([conky_version_revision],[r@REVISION@])
 m4_define([conky_version], 
     [conky_version_major().conky_version_minor().conky_version_micro()ifelse(

diff --git a/src/timed_thread.c b/src/timed_thread.c
index a221675..13743a8 100644 (file)
--- a/src/timed_thread.c
+++ b/src/timed_thread.c
@@ -87,7 +87,8 @@ timed_thread_create (void *(*start_routine)(void*), void *arg, unsigned int inte
 {
   timed_thread *p_timed_thread;
 
-  assert ((start_routine != NULL) && (interval_usecs >= MINIMUM_INTERVAL_USECS));
+  assert (start_routine != NULL);
+  assert (interval_usecs >= MINIMUM_INTERVAL_USECS);
 
   if ((p_timed_thread = calloc (sizeof(timed_thread), 1)) == 0)
     return NULL;