aboutsummaryrefslogtreecommitdiffstats
path: root/extension
diff options
context:
space:
mode:
authorArnold D. Robbins <arnold@skeeve.com>2017-01-21 20:17:16 +0200
committerArnold D. Robbins <arnold@skeeve.com>2017-01-21 20:17:16 +0200
commit9bcdc40b4d7eea3bac7869520176628c30fb5971 (patch)
tree2b31b3bce79e97445e9bb8478e0fdfc70f3dd28f /extension
parentfb5edec7717ee9759785c8671fe71623dfee23a2 (diff)
parentae02ce389bfd1bcb2797fe64d73a91ef73705688 (diff)
downloadegawk-9bcdc40b4d7eea3bac7869520176628c30fb5971.tar.gz
egawk-9bcdc40b4d7eea3bac7869520176628c30fb5971.tar.bz2
egawk-9bcdc40b4d7eea3bac7869520176628c30fb5971.zip
Merge branch 'master' into feature/api-mpfr
Diffstat (limited to 'extension')
-rw-r--r--extension/ChangeLog10
-rw-r--r--extension/inplace.c2
-rw-r--r--extension/rwarray.c1
-rw-r--r--extension/testext.c9
4 files changed, 21 insertions, 1 deletions
diff --git a/extension/ChangeLog b/extension/ChangeLog
index 84f14679..6e312260 100644
--- a/extension/ChangeLog
+++ b/extension/ChangeLog
@@ -1,3 +1,13 @@
+2017-01-21 Eli Zaretskii <eliz@gnu.org>
+
+ * testext.c (getuid) [__MINGW32__]: New function, mirrors what
+ pc/getid.c does in Gawk.
+ * rwarray.c [__MINGW32__]: Include stdint.h, otherwise using
+ uint32_t causes compilation errors.
+ * inplace.c (_XOPEN_SOURCE): Define to 1, not to nothing. MinGW
+ system headers assume that if this is defined, it must have a
+ numeric value.
+
2017-01-06 Andrew J. Schorr <aschorr@telemetry-investments.com>
* intdiv.c: New extension to demonstrate how to implement intdiv
diff --git a/extension/inplace.c b/extension/inplace.c
index 5457287f..ecc3afdc 100644
--- a/extension/inplace.c
+++ b/extension/inplace.c
@@ -28,7 +28,7 @@
#endif
#ifndef _XOPEN_SOURCE
-# define _XOPEN_SOURCE
+# define _XOPEN_SOURCE 1
#endif
#ifndef _XOPEN_SOURCE_EXTENDED
# define _XOPEN_SOURCE_EXTENDED 1
diff --git a/extension/rwarray.c b/extension/rwarray.c
index 186dac0f..a7d752cf 100644
--- a/extension/rwarray.c
+++ b/extension/rwarray.c
@@ -41,6 +41,7 @@
#ifdef __MINGW32__
#include <winsock2.h>
+#include <stdint.h>
#else
#include <arpa/inet.h>
#endif
diff --git a/extension/testext.c b/extension/testext.c
index d23ad368..572475e0 100644
--- a/extension/testext.c
+++ b/extension/testext.c
@@ -49,6 +49,15 @@ int plugin_is_GPL_compatible;
static void fill_in_array(awk_value_t *value);
+#ifdef __MINGW32__
+unsigned int
+getuid (void)
+{
+ /* See pc/getid.c. */
+ return 0;
+}
+#endif
+
/* valrep2str --- turn a value into a string */
static const char *