diff --git a/Makefile.am b/Makefile.am index 6d42fb5fd23c37948749f8a3333ff28ce91656aa..c70902a2a1427d73a037710c01c8fe397968e5cb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -10,11 +10,8 @@ AUTOMAKE_OPTIONS = foreign 1.2 lib_LTLIBRARIES = liboop.la liboop-adns.la liboop-glib.la liboop-www.la liboop-rl.la INCLUDES = $(GLIB_INCLUDES) $(WWW_INCLUDES) -# versions updated as of 0.4; 0.5 only changes build stuff; -# 0.6 only adds the readline interface. -# 0.7 breaks compatibility (OOP_CONTINUE / OOP_HALT) - -liboop_la_LDFLAGS = -version-info 2:0:0 # version:revision:age +# versions updated as of 0.7 +liboop_la_LDFLAGS = -version-info 3:0:0 # version:revision:age liboop_la_SOURCES = sys.c select.c signal.c alloc.c liboop_adns_la_LDFLAGS = -version-info 1:0:1 diff --git a/alloc.c b/alloc.c index 99629c59ee72f086c19758e067554416aafa365f..3a243e7a718e380192a500a32053a2b92a953955 100644 --- a/alloc.c +++ b/alloc.c @@ -4,3 +4,5 @@ void *(*oop_malloc)(size_t) = malloc; void (*oop_free)(void *) = free; void *(*oop_realloc)(void *,size_t) = realloc; + +int _oop_continue; /* this has to go somewhere */ diff --git a/configure.in b/configure.in index 3a6a18dc9b6e1d1fc0643140e4e5d6626329c3ad..169eae4d0c5fd48ee70a18581a4ef6490ca322ef 100644 --- a/configure.in +++ b/configure.in @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(INSTALL) -AM_INIT_AUTOMAKE(liboop,0.6) +AM_INIT_AUTOMAKE(liboop,0.7) AC_CANONICAL_HOST dnl Use libtool for shared libraries diff --git a/oop.h b/oop.h index 5ac50939608e93d691f6894c60f8804f07ccf391..2c2dd50d46308b37fe774d0b4945b914d2d32f39 100644 --- a/oop.h +++ b/oop.h @@ -31,8 +31,8 @@ static const struct timeval OOP_TIME_NOW = { 0, 0 }; #define OOP_NUM_SIGNALS 256 /* Callbacks may return one of these */ -extern int _oop_halt; /* internal only */ -#define OOP_CONTINUE ((void *) &_oop_halt) +extern int _oop_continue; /* internal only */ +#define OOP_CONTINUE ((void *) &_oop_continue) #define OOP_HALT ((void *) NULL) /* (or any other value except OOP_CONTINUE) */ /* Callback function prototypes */ diff --git a/sys.c b/sys.c index 1406eeebbaf5025bb0981d7f15241fb357a796a8..97bd3e3eb35870110bf87cf7840f0fc07084a14c 100644 --- a/sys.c +++ b/sys.c @@ -19,8 +19,6 @@ #include <sys/select.h> #endif -int _oop_halt; /* this has to go somewhere */ - #define MAGIC 0x9643 struct sys_time {