denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed HAVE_BACKTRACE checks

Browse Source 
starter Makefile now uses proper $(COMPILE) to build pluto objects
This commit is contained in:
Martin Willi
2006-12-11 09:29:34 +00:00
parent e696757c47
commit 5347a84f81
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/charon/daemon.c
+4 -2
View File
@@ -29,10 +29,12 @@
#include <sys/types.h> #include <sys/types.h>
#include <unistd.h> #include <unistd.h>
#include <time.h> #include <time.h>
#include <execinfo.h>
#include <string.h> #include <string.h>
#include <getopt.h> #include <getopt.h>
#include <errno.h> #include <errno.h>
#ifdef HAVE_BACKTRACE
# include <execinfo.h>
#endif /* HAVE_BACKTRACE */
#include "daemon.h" #include "daemon.h"
@@ -285,7 +287,7 @@ static void initialize(private_daemon_t *this, bool strict, bool syslog,
*/ */
void signal_handler(int signal) void signal_handler(int signal)
{ {
#ifndef HAVE_BACKTRACE #ifdef HAVE_BACKTRACE
void *array[20]; void *array[20];
size_t size; size_t size;
char **strings; char **strings;
src/libstrongswan/utils/leak_detective.c
+3 -1
View File
@@ -23,7 +23,6 @@
#include <string.h> #include <string.h>
#include <stdio.h> #include <stdio.h>
#include <malloc.h> #include <malloc.h>
#include <execinfo.h>
#include <signal.h> #include <signal.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <netinet/in.h> #include <netinet/in.h>
@@ -34,6 +33,9 @@
#include <pthread.h> #include <pthread.h>
#include <netdb.h> #include <netdb.h>
#include <printf.h> #include <printf.h>
#ifdef HAVE_BACKTRACE
# include <execinfo.h>
#endif /* HAVE_BACKTRACE */
#include "leak_detective.h" #include "leak_detective.h"
src/starter/Makefile.am
+2 -2
View File
@@ -28,10 +28,10 @@ keywords.c: keywords.txt keywords.h
$(GPERF) -C -G -t < keywords.txt > keywords.c $(GPERF) -C -G -t < keywords.txt > keywords.c
loglite.o: $(OPENACDIR)/loglite.c $(PLUTODIR)/log.h loglite.o: $(OPENACDIR)/loglite.c $(PLUTODIR)/log.h
$(CC) $(AM_CFLAGS) $(INCLUDES) -c -o $@ $< $(COMPILE) -c -o $@ $<
defs.o: $(PLUTODIR)/defs.c $(PLUTODIR)/defs.h defs.o: $(PLUTODIR)/defs.c $(PLUTODIR)/defs.h
$(CC) $(AM_CFLAGS) $(INCLUDES) -c -o $@ $< $(COMPILE) -c -o $@ $<
install-exec-local : install-exec-local :
test -e "$(sysconfdir)/ipsec.conf" || $(INSTALL) ipsec.conf $(sysconfdir)/ipsec.conf test -e "$(sysconfdir)/ipsec.conf" || $(INSTALL) ipsec.conf $(sysconfdir)/ipsec.conf