diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Makefile | 4 | ||||
| -rw-r--r-- | lib/db.h | 8 |
2 files changed, 4 insertions, 8 deletions
diff --git a/lib/Makefile b/lib/Makefile index 6c00449..f3ab6dd 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -26,7 +26,7 @@ CFLAGS += $(shell pkg-config --cflags uuid) CFLAGS += $(shell pkg-config --cflags zlib) BASELIBS += -lrt -BASELIBS += $(shell mysql_config --libs_r) +BASELIBS += $(shell $(SQLCFG) --libs_r) BASELIBS += $(shell pkg-config --libs uuid) BASELIBS += $(shell pkg-config --libs zlib) BASELIBS += $(PYTHON_LIBS) @@ -53,7 +53,7 @@ ifdef SYSD_NOTIFY CFLAGS += $(shell pkg-config --cflags libsystemd-daemon) endif -CFLAGS += $(shell mysql_config --include) +CFLAGS += $(shell $(SQLCFG) --include) DEFINES += $(USES) all: lib $(TEST) $(DEMO) @@ -5,8 +5,7 @@ * */ -#ifndef __DB_H -#define __DB_H +#pragma once #include <linux/unistd.h> @@ -16,7 +15,7 @@ #include <stdarg.h> #include <errno.h> -#include <mysql/mysql.h> +#include <mysql.h> #include <list> @@ -1368,6 +1367,3 @@ class cDbProcedure : public cDbService char* name; }; - -//*************************************************************************** -#endif //__DB_H |