summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn Strauss <gstrauss@gluelogic.com>2020-07-17 18:54:29 -0400
committerGlenn Strauss <gstrauss@gluelogic.com>2020-07-21 12:08:27 -0400
commitbe8047d82fb25cfcae435af77a8d4f650682e5fa (patch)
tree6d7b10ba6fbf06918b27decaf5de971fffd7084e
parent5722574df5b2a2dc6dbd2d198d7af3841d869057 (diff)
downloadlighttpd-git-be8047d82fb25cfcae435af77a8d4f650682e5fa.tar.gz
[build] build fixes for AIX
x-ref: "Compile on AIX conflicting types for 'etag_create'" https://redmine.lighttpd.net/boards/2/topics/9242
-rw-r--r--src/etag.h4
-rw-r--r--src/mod_webdav.c2
2 files changed, 6 insertions, 0 deletions
diff --git a/src/etag.h b/src/etag.h
index 7c1dd350..82a7de90 100644
--- a/src/etag.h
+++ b/src/etag.h
@@ -4,7 +4,11 @@
#include "buffer.h"
+#ifdef _AIX
+#include <sys/stat.h>
+#else
struct stat; /* declaration */
+#endif
typedef enum { ETAG_USE_INODE = 1, ETAG_USE_MTIME = 2, ETAG_USE_SIZE = 4 } etag_flags_t;
diff --git a/src/mod_webdav.c b/src/mod_webdav.c
index c00f468d..a38082c0 100644
--- a/src/mod_webdav.c
+++ b/src/mod_webdav.c
@@ -2714,7 +2714,9 @@ webdav_copymove_dir (const plugin_config * const pconf,
else {
switch (errno) {
case EEXIST:
+ #if EEXIST != ENOTEMPTY
case ENOTEMPTY:
+ #endif
if (!overwrite) {
webdav_xml_response_status(b, &src->rel_path, 412);
return 412; /* Precondition Failed */