From a7b3392b09a18a4f8c40b732b50db12ce70a28cd Mon Sep 17 00:00:00 2001 From: horchi Date: Mon, 3 Jan 2022 19:33:57 +0100 Subject: 2022-01-03: version 1.2.4 (horchi)\n - change: Removed dependency to mysql-compat package\n\n --- lib/Makefile | 4 ++-- lib/db.h | 8 ++------ 2 files changed, 4 insertions(+), 8 deletions(-) (limited to 'lib') 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) diff --git a/lib/db.h b/lib/db.h index 8c95882..17c6b25 100644 --- a/lib/db.h +++ b/lib/db.h @@ -5,8 +5,7 @@ * */ -#ifndef __DB_H -#define __DB_H +#pragma once #include @@ -16,7 +15,7 @@ #include #include -#include +#include #include @@ -1368,6 +1367,3 @@ class cDbProcedure : public cDbService char* name; }; - -//*************************************************************************** -#endif //__DB_H -- cgit v1.2.3