Merge branch 'master' into autotools-conversion

Lost the ksh93 submodule so will re-add in a later commit.
2021-01-30 19:04:10 -07:00
parent e18e2480dc 9a695e9411
commit ece5c0ea14
1044 changed files with 2966 additions and 197577 deletions
--- a/cde/programs/dtinfo/DtMmdb/btree/mmdb_btree.h
+++ b/cde/programs/dtinfo/DtMmdb/btree/mmdb_btree.h
@@ -54,7 +54,7 @@
 #include "storage/unixf_storage.h"
 #include "dynhash/data_t.h"

-#ifdef SVR4
+#if defined(SVR4) || defined(__linux__)

 #include <sys/types.h>
 #include <sys/stat.h>
--- a/cde/programs/dtinfo/dtinfo/src/UAS/Base/UAS_SearchZones.hh
+++ b/cde/programs/dtinfo/dtinfo/src/UAS/Base/UAS_SearchZones.hh
@@ -24,7 +24,8 @@
 #ifndef _UAS_SearchZones_hh_
 #define _UAS_SearchZones_hh_

-#include "unistd.h"
+#include <unistd.h>
+#include "config.h" // for u_int

 #include "UAS_String.hh"