refresh libusual

diff --git a/lib b/lib
index e004bf6f17fcb85beed1c88a22f185a70448dcc9..4610ee14a97eaca12045fd273a3b380281080116 160000 (submodule)
--- a/lib
+++ b/lib
@@ -1 +1 @@
-Subproject commit e004bf6f17fcb85beed1c88a22f185a70448dcc9
+Subproject commit 4610ee14a97eaca12045fd273a3b380281080116

diff --git a/sql/ticker/Makefile b/sql/ticker/Makefile
index feb5bfe539e8a9dfc88eb1cebf2b042177cf5295..57876a4d78884600ad3368b6f843c798b05d6994 100644 (file)
--- a/sql/ticker/Makefile
+++ b/sql/ticker/Makefile
@@ -1,16 +1,17 @@
 
 include ../../config.mak
 
+SRCS = connection.c pgqd.c maint.c ticker.c retry.c
+LOCAL_HDRS = connection.h pgqd.h
+
 USUAL_DIR = ../../lib
 USUAL_OBJDIR = .
-USUAL_MODULES = logging daemon event string time cfparser fileutil \
-               socket compat heap-impl base mbuf
+USUAL_LOCAL_SRCS = $(SRCS) connection.h pgqd.h
 include $(USUAL_DIR)/Setup.mk
 
 PROGRAM = pgqd
 
-SRCS = connection.c pgqd.c maint.c ticker.c retry.c
-HDRS = connection.h pgqd.h $(USUAL_HDRS)
+HDRS = $(LOCAL_HDRS) $(USUAL_HDRS)
 
 PG_INCDIR = $(shell $(PG_CONFIG) --includedir)
 PG_LIBDIR = $(shell $(PG_CONFIG) --libdir)

diff --git a/sql/ticker/connection.c b/sql/ticker/connection.c
index ebac958d185e2adcc71f6c29a1f2d68b9c2e6d98..c2d2c1f19ab8f409fee50d5177ec7954e721c314 100644 (file)
--- a/sql/ticker/connection.c
+++ b/sql/ticker/connection.c
@@ -1,7 +1,6 @@
 #include "connection.h"
 
 #include <sys/types.h>
-#include <unistd.h>
 #include <stdarg.h>
 #include <math.h>
 

diff --git a/sql/ticker/pgqd.c b/sql/ticker/pgqd.c
index d99fc6f253d60c9baeeb2921bbfe25e66a33bdc0..4abb33b702fdc3e2661945aac5a2804b95210e88 100644 (file)
--- a/sql/ticker/pgqd.c
+++ b/sql/ticker/pgqd.c
@@ -1,12 +1,10 @@
 #include "pgqd.h"
 
 #include <getopt.h>
-#include <errno.h>
-#include <signal.h>
 
 #include <usual/event.h>
 #include <usual/string.h>
-#include <usual/alloc.h>
+#include <usual/signal.h>
 #include <usual/daemon.h>
 #include <usual/cfparser.h>
 #include <usual/time.h>
@@ -45,7 +43,7 @@ static const struct CfKey conf_params[] = {
        { NULL },
 };
 
-static void *get_cf_target(void *arg) { return &cf; }
+static void *get_cf_target(void *arg, const char *name) { return &cf; }
 
 static const struct CfSect conf_sects[] = {
        { "pgqd", get_cf_target, conf_params },

diff --git a/sql/ticker/pgqd.h b/sql/ticker/pgqd.h
index 14e56c28cfc5620ad0490260b4451bcaf7473d74..3e5a43fa9efa88fca25ce4dfe747b36485de8f7c 100644 (file)
--- a/sql/ticker/pgqd.h
+++ b/sql/ticker/pgqd.h
@@ -2,15 +2,11 @@
 #ifndef __PGQD_H__
 #define __PGQD_H__
 
-#include <sys/types.h>
-#include <unistd.h>
-#include <stdlib.h>
 #include <string.h>
 
 #define Assert(x)
 
 #include <usual/list.h>
-#include <usual/alloc.h>
 #include <usual/statlist.h>
 #include <usual/logging.h>