diff options
| author | portix <none@none> | 2012-12-14 23:25:35 +0100 |
|---|---|---|
| committer | portix <none@none> | 2012-12-14 23:25:35 +0100 |
| commit | a8b52268e985e90b2fced4b887b844626284e442 (patch) | |
| tree | 0a3119ff148b6c6e844b80317dd0936dd4ff824a | |
| parent | b9895174de56e9435aaa365bddc7af1a677ab39f (diff) | |
| download | dwb-a8b52268e985e90b2fced4b887b844626284e442.zip | |
Include config.mk in the tools Makefile; call va_arg also for undefined objects in signal callbacks
| -rw-r--r-- | config.mk | 2 | ||||
| -rw-r--r-- | src/scripts.c | 1 | ||||
| -rw-r--r-- | tools/Makefile | 3 |
3 files changed, 3 insertions, 3 deletions
@@ -34,7 +34,7 @@ DTARGET=$(TARGET)_d # target directories -PREFIX=/usr +PREFIX=/home/stefan/foobar BINDIR=$(PREFIX)/bin DATAROOTDIR=$(PREFIX)/share DATADIR=$(DATAROOTDIR) diff --git a/src/scripts.c b/src/scripts.c index a39777e8..02a47fb3 100644 --- a/src/scripts.c +++ b/src/scripts.c @@ -2272,6 +2272,7 @@ connect_callback(SSignal *sig, ...) } else { + va_arg(args, void*); cur = UNDEFINED; } diff --git a/tools/Makefile b/tools/Makefile index 8564fa79..fdf78144 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -1,12 +1,11 @@ # See COPYING for copyright and license details +include ../config.mk TARGET=dwbem OBJ = $(patsubst %.c, %.o, $(wildcard *.c)) LIBS=libsoup-2.4 glib-2.0 -PREFIX ?= /usr - SYSTEM_EXTENSION_DIR=$(PREFIX)/share/dwb/extensions CFLAGS := $(CFLAGS) |