summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile.am5
-rw-r--r--src/util/sss_tc_utf8.c1
-rw-r--r--src/util/sss_utf8.c3
-rw-r--r--src/util/sss_utf8.h7
4 files changed, 14 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am
index 5c81c92c8..9e6438e9b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -944,9 +944,14 @@ libipa_hbac_la_DEPENDENCIES = src/lib/ipa_hbac/ipa_hbac.exports
libipa_hbac_la_SOURCES = \
src/lib/ipa_hbac/hbac_evaluator.c \
src/util/sss_utf8.c
+# libipa_hbac is also used by external projects such as pam_hbac which
+# support platforms that do not have a C99 compiler. We add -std=c89
+# explicitly here to make sure we don't accidentally add a C99 feature
+# to the libipa_hbac code
libipa_hbac_la_CFLAGS = \
$(AM_CFLAGS) \
-I$(top_srcdir)/src/util \
+ -std=c89 \
$(NULL)
libipa_hbac_la_LIBADD = \
$(UNICODE_LIBS)
diff --git a/src/util/sss_tc_utf8.c b/src/util/sss_tc_utf8.c
index 4b2c49316..44194ab02 100644
--- a/src/util/sss_tc_utf8.c
+++ b/src/util/sss_tc_utf8.c
@@ -19,6 +19,7 @@
*/
#include <talloc.h>
+#include "util/util.h"
#include "util/sss_utf8.h"
char *
diff --git a/src/util/sss_utf8.c b/src/util/sss_utf8.c
index 7ba11ca75..722f28d08 100644
--- a/src/util/sss_utf8.c
+++ b/src/util/sss_utf8.c
@@ -22,6 +22,9 @@
#include "config.h"
+#include <string.h>
+#include <errno.h>
+
#ifdef HAVE_LIBUNISTRING
#include <unistr.h>
#include <unicase.h>
diff --git a/src/util/sss_utf8.h b/src/util/sss_utf8.h
index 95b085f56..bca9b2c51 100644
--- a/src/util/sss_utf8.h
+++ b/src/util/sss_utf8.h
@@ -23,12 +23,15 @@
#ifndef SSS_UTF8_H_
#define SSS_UTF8_H_
-#include "util/util.h"
-
#ifndef ENOMATCH
#define ENOMATCH -1
#endif
+#include <stdint.h>
+#include <stdbool.h>
+
+#include "util/util_errors.h"
+
void sss_utf8_free(void *ptr);
/* The result must be freed with sss_utf8_free() */