diff options
Diffstat (limited to 'lib/tdb')
| -rw-r--r-- | lib/tdb/config.mk | 2 | ||||
| -rw-r--r-- | lib/tdb/pytdb.c | 11 | ||||
| -rw-r--r-- | lib/tdb/python.mk | 6 |
3 files changed, 6 insertions, 13 deletions
diff --git a/lib/tdb/config.mk b/lib/tdb/config.mk index 90c9ba2863..38b03b93b6 100644 --- a/lib/tdb/config.mk +++ b/lib/tdb/config.mk @@ -1,7 +1,7 @@ ################################################ # Start SUBSYSTEM LIBTDB [LIBRARY::LIBTDB] -OUTPUT_TYPE = STATIC_LIBRARY +OUTPUT_TYPE = MERGED_OBJ CFLAGS = -I$(tdbsrcdir)/include # # End SUBSYSTEM ldb diff --git a/lib/tdb/pytdb.c b/lib/tdb/pytdb.c index 15a8d8a3e2..159bc4dce5 100644 --- a/lib/tdb/pytdb.c +++ b/lib/tdb/pytdb.c @@ -24,21 +24,16 @@ License along with this library; if not, see <http://www.gnu.org/licenses/>. */ +#include "replace.h" +#include "system/filesys.h" + #include <Python.h> #ifndef Py_RETURN_NONE #define Py_RETURN_NONE return Py_INCREF(Py_None), Py_None #endif -#ifdef HAVE_FSTAT -#undef HAVE_FSTAT -#endif - /* Include tdb headers */ -#include <stdint.h> -#include <signal.h> #include <tdb.h> -#include <fcntl.h> -#include <stdbool.h> typedef struct { PyObject_HEAD diff --git a/lib/tdb/python.mk b/lib/tdb/python.mk index a4e6037993..1f2d4ca4a8 100644 --- a/lib/tdb/python.mk +++ b/lib/tdb/python.mk @@ -1,8 +1,6 @@ -[PYTHON::swig_tdb] +[PYTHON::pytdb] LIBRARY_REALNAME = tdb.$(SHLIBEXT) PUBLIC_DEPENDENCIES = LIBTDB DYNCONFIG -swig_tdb_OBJ_FILES = $(tdbsrcdir)/pytdb.o - -$(swig_tdb_OBJ_FILES): CFLAGS+=$(CFLAG_NO_CAST_QUAL) +pytdb_OBJ_FILES = $(tdbsrcdir)/pytdb.o |