Merge pull request #156 from sureshsundriyal/wip

[Compile errors] test_override.cc -> test_override.c
9 years ago · ef686b6932
parent ab257af0c7 acd913b9f9
commit ef686b6932
3 changed files with 2 additions and 4 deletions
--- a/src/Makefile.am
+++ b/src/Makefile.am
@ -248,7 +248,7 @@ lnav_LDADD = \
 	$(TEXT2C_FILES) \
 	$(LDADD)

-lnav_test_SOURCES = lnav.cc $(HELP_SRC) test_override.cc
+lnav_test_SOURCES = lnav.cc $(HELP_SRC) test_override.c
 lnav_test_LDADD = \
 	$(TEXT2C_FILES) \
 	$(LDADD)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@ -552,7 +552,7 @@ lnav_LDADD = \
 	$(TEXT2C_FILES) \
 	$(LDADD)

-lnav_test_SOURCES = lnav.cc $(HELP_SRC) test_override.cc
+lnav_test_SOURCES = lnav.cc $(HELP_SRC) test_override.c
 lnav_test_LDADD = \
 	$(TEXT2C_FILES) \
 	$(LDADD)
--- a/src/test_override.cc
+++ b/src/test_override.cc
@ -1,8 +1,6 @@
 #include "config.h"

 #include <time.h>
-#include <sys/time.h>
-#include <stddef.h>

 time_t time(time_t *loc)
 {