Browse Source

Update the micro-revision.i dependencies, and add a stdlib.h

Nick Mathewson 6 years ago
parent
commit
4118ba67db
3 changed files with 6 additions and 2 deletions
  1. 1 0
      src/lib/container/smartlist.h
  2. 3 0
      src/lib/log/include.am
  3. 2 2
      src/or/include.am

+ 1 - 0
src/lib/container/smartlist.h

@@ -65,6 +65,7 @@ void smartlist_subtract(smartlist_t *sl1, const smartlist_t *sl2);
 /* smartlist_choose() is defined in crypto.[ch] */
 #ifdef DEBUG_SMARTLIST
 #include "lib/err/torerr.h"
+#include <stdlib.h>
 /** Return the number of items in sl.
  */
 static inline int smartlist_len(const smartlist_t *sl);

+ 3 - 0
src/lib/log/include.am

@@ -15,6 +15,9 @@ src_lib_libtor_log_testing_a_SOURCES = \
 src_lib_libtor_log_testing_a_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS)
 src_lib_libtor_log_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS)
 
+src/lib/log/torlog.$(OBJEXT) \
+  src/lib/log/src_lib_libtor_log_testing_a-torlog.$(OBJEXT): micro-revision.i
+
 noinst_HEADERS +=					\
 	src/lib/log/ratelim.h				\
 	src/lib/log/torlog.h				\

+ 2 - 2
src/or/include.am

@@ -143,8 +143,8 @@ endif
 
 src_or_tor_SOURCES = src/or/tor_main.c
 
-src/or/tor_main.$(OBJEXT) \
-  src/or/src_or_tor_cov-tor_main.$(OBJEXT): micro-revision.i
+src/or/git_revision.$(OBJEXT) \
+  src/or/src_or_libtor_app_testing_a-git_revision.$(OBJEXT): micro-revision.i
 
 AM_CPPFLAGS += -DSHARE_DATADIR="\"$(datadir)\""		\
 		-DLOCALSTATEDIR="\"$(localstatedir)\""	\