From 92f85920b02ad5c9c4262c2c17778f69779c0604 Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Wed, 6 Feb 2019 08:37:39 +0000
Subject:  Rename mkLtemp to mkhtemp; try to make MacOS happy

---
 src/include/skalibs/nonposix.h |  7 +++++++
 src/include/skalibs/posixplz.h |  2 +-
 src/libposixplz/mkLtemp.c      | 10 ----------
 src/libposixplz/mkhtemp.c      | 10 ++++++++++
 src/libstddjb/env_dump.c       |  2 ++
 5 files changed, 20 insertions(+), 11 deletions(-)
 delete mode 100644 src/libposixplz/mkLtemp.c
 create mode 100644 src/libposixplz/mkhtemp.c

(limited to 'src')

diff --git a/src/include/skalibs/nonposix.h b/src/include/skalibs/nonposix.h
index 3ef4e99..be7e90d 100644
--- a/src/include/skalibs/nonposix.h
+++ b/src/include/skalibs/nonposix.h
@@ -53,6 +53,13 @@
 #endif
 
 
+ /* MacOS: needs this for full SUSv3 conformance. Don't ask. */
+
+#ifndef _DARWIN_C_SOURCE
+#define _DARWIN_C_SOURCE
+#endif
+
+
  /* Unfortunately we can't fully avoid #ifdef forests,
     because the BSDs are bloody snowflakes. See: setgroups(). */
 
diff --git a/src/include/skalibs/posixplz.h b/src/include/skalibs/posixplz.h
index f1b54d3..dda66ee 100644
--- a/src/include/skalibs/posixplz.h
+++ b/src/include/skalibs/posixplz.h
@@ -51,7 +51,7 @@ extern int mkfiletemp (char *, createfunc_t_ref, mode_t, void *) ;
 extern int mklinktemp (char const *, char *, linkfunc_t_ref) ;
 extern int mkptemp (char *) ;
 extern int mkltemp (char const *, char *) ;
-extern int mkLtemp (char const *, char *) ;
+extern int mkhtemp (char const *, char *) ;
 extern int mkctemp (char *, mode_t, dev_t) ;
 extern int mkbtemp (char *, mode_t, dev_t) ;
 
diff --git a/src/libposixplz/mkLtemp.c b/src/libposixplz/mkLtemp.c
deleted file mode 100644
index 5c9ccb0..0000000
--- a/src/libposixplz/mkLtemp.c
+++ /dev/null
@@ -1,10 +0,0 @@
-/* ISC license. */
-
-#include <unistd.h>
-
-#include <skalibs/posixplz.h>
-
-int mkLtemp (char const *src, char *dst)
-{
-  return mklinktemp(src, dst, &link) ;
-}
diff --git a/src/libposixplz/mkhtemp.c b/src/libposixplz/mkhtemp.c
new file mode 100644
index 0000000..0555ef3
--- /dev/null
+++ b/src/libposixplz/mkhtemp.c
@@ -0,0 +1,10 @@
+/* ISC license. */
+
+#include <unistd.h>
+
+#include <skalibs/posixplz.h>
+
+int mkhtemp (char const *src, char *dst)
+{
+  return mklinktemp(src, dst, &link) ;
+}
diff --git a/src/libstddjb/env_dump.c b/src/libstddjb/env_dump.c
index e15c6be..fc79bc3 100644
--- a/src/libstddjb/env_dump.c
+++ b/src/libstddjb/env_dump.c
@@ -1,5 +1,7 @@
 /* ISC license. */
 
+#include <skalibs/nonposix.h>
+#include <unistd.h>
 #include <sys/stat.h>
 #include <string.h>
 #include <errno.h>
-- 
cgit v1.3.1