summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2013-09-23 20:44:58 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2013-09-23 20:44:58 -0700
commitd160dd0c71db061d819ce5ac337e4de8bd4f7d11 (patch)
tree0495d4ef991463063951262db88cb852aa5a92c6
parent84998447c3c9c37935a1dd948e3739cff5b9e71b (diff)
downloademacs-d160dd0c71db061d819ce5ac337e4de8bd4f7d11.tar.gz
* alloc.c (valgrind_p): Use bool for boolean.
-rw-r--r--src/ChangeLog4
-rw-r--r--src/alloc.c10
2 files changed, 9 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 4fdf461b57d..5676d3e8b9a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2013-09-24 Paul Eggert <eggert@cs.ucla.edu>
+
+ * alloc.c (valgrind_p): Use bool for boolean.
+
2013-09-23 Dmitry Antipov <dmantipov@yandex.ru>
* xdisp.c (noninteractive_need_newline, message_log_need_newline)
diff --git a/src/alloc.c b/src/alloc.c
index 564faa18aa8..02742c4cf4a 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -45,16 +45,16 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#include <verify.h>
-#if (defined ENABLE_CHECKING && \
- defined HAVE_VALGRIND_VALGRIND_H && \
- !defined USE_VALGRIND)
+#if (defined ENABLE_CHECKING \
+ && defined HAVE_VALGRIND_VALGRIND_H \
+ && !defined USE_VALGRIND)
# define USE_VALGRIND 1
#endif
#if USE_VALGRIND
#include <valgrind/valgrind.h>
#include <valgrind/memcheck.h>
-static int valgrind_p;
+static bool valgrind_p;
#endif
/* GC_CHECK_MARKED_OBJECTS means do sanity checks on allocated objects.
@@ -6667,7 +6667,7 @@ init_alloc (void)
gcs_done = 0;
#if USE_VALGRIND
- valgrind_p = RUNNING_ON_VALGRIND;
+ valgrind_p = RUNNING_ON_VALGRIND != 0;
#endif
}