ims-volte-vowifi
/
strongswan
9
0
Fork 0
Code Pull Requests Releases Activity

fixed HAVE_BACKTRACE checks 

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/charon/daemon.c
View File

@ -29,10 +29,12 @@
#include <sys/types.h>
#include <unistd.h>
#include <time.h>
#include <execinfo.h>
#include <string.h>
#include <getopt.h>
#include <errno.h>
#ifdef HAVE_BACKTRACE
# include <execinfo.h>
#endif /* HAVE_BACKTRACE */
#include "daemon.h"
@ -285,7 +287,7 @@ static void initialize(private_daemon_t *this, bool strict, bool syslog,
*/
void signal_handler(int signal)
{
#ifndef HAVE_BACKTRACE
#ifdef HAVE_BACKTRACE
void *array[20];
size_t size;
char **strings;

4
src/libstrongswan/utils/leak_detective.c
View File

@ -23,7 +23,6 @@
#include <string.h>
#include <stdio.h>
#include <malloc.h>
#include <execinfo.h>
#include <signal.h>
#include <sys/socket.h>
#include <netinet/in.h>
@ -34,6 +33,9 @@
#include <pthread.h>
#include <netdb.h>
#include <printf.h>
#ifdef HAVE_BACKTRACE
# include <execinfo.h>
#endif /* HAVE_BACKTRACE */
#include "leak_detective.h"

4
src/starter/Makefile.am
View File

@ -28,10 +28,10 @@ keywords.c: keywords.txt keywords.h
$(GPERF) -C -G -t < keywords.txt > keywords.c
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
$(CC) $(AM_CFLAGS) $(INCLUDES) -c -o $@ $<
$(COMPILE) -c -o $@ $<
install-exec-local :
test -e "$(sysconfdir)/ipsec.conf" || $(INSTALL) ipsec.conf $(sysconfdir)/ipsec.conf