Merge branch 'master' into gniibe/t6236

2 files changed, 3 insertions, 30 deletions

diff --git a/src/assuan.h.in b/src/assuan.h.in
index e993926..cf79970 100644
--- a/src/assuan.h.in
+++ b/src/assuan.h.in
@@ -32,8 +32,8 @@
 #define ASSUAN_H
 
 #include <stdio.h>
-@include:sys/types.h@
-@include:unistd.h@
+#include <sys/types.h>
+#include <unistd.h>
 #include <stdarg.h>
 
 #ifndef _ASSUAN_NO_SOCKET_WRAPPER
@@ -602,8 +602,6 @@ pid_t __assuan_waitpid (assuan_context_t ctx, pid_t pid,
 extern struct assuan_system_hooks _assuan_system_npth;
 #define ASSUAN_SYSTEM_NPTH &_assuan_system_npth
 
-@include:w32ce-add@
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/mkheader.c b/src/mkheader.c
index b151ca0..c081e09 100644
--- a/src/mkheader.c
+++ b/src/mkheader.c
@@ -84,24 +84,6 @@ write_special (const char *fname, int lnr, const char *tag)
       else
         include_file (fname, lnr, "posix-includes.inc.h");
     }
-  else if (!strcmp (tag, "include:sys/types.h"))
-    {
-      if (!strcmp (host_os, "mingw32ce"))
-        fputs ("#ifdef __MINGW32CE__\n"
-               "# include <sys/types.h>\n"
-               "#endif\n", stdout);
-      else
-        fputs ("#include <sys/types.h>\n", stdout);
-    }
-  else if (!strcmp (tag, "include:unistd.h"))
-    {
-      if (!strcmp (host_os, "mingw32ce"))
-        fputs ("#ifdef __MINGW32CE__\n"
-               "# include <unistd.h>\n"
-               "#endif\n", stdout);
-      else
-        fputs ("#include <unistd.h>\n", stdout);
-    }
   else if (!strcmp (tag, "include:types"))
     {
       if (strstr (host_os, "mingw32"))
@@ -111,9 +93,7 @@ write_special (const char *fname, int lnr, const char *tag)
     }
   else if (!strcmp (tag, "include:fd-t"))
     {
-      if (!strcmp (host_os, "mingw32ce"))
-        include_file (fname, lnr, "w32ce-fd-t.inc.h");
-      else if (strstr (host_os, "mingw32"))
+      if (strstr (host_os, "mingw32"))
         include_file (fname, lnr, "w32-fd-t.inc.h");
       else
         include_file (fname, lnr, "posix-fd-t.inc.h");
@@ -125,11 +105,6 @@ write_special (const char *fname, int lnr, const char *tag)
       else
         include_file (fname, lnr, "posix-sock-nonce.inc.h");
     }
-  else if (!strcmp (tag, "include:w32ce-add"))
-    {
-      if (!strcmp (host_os, "mingw32ce"))
-        include_file (fname, lnr, "w32ce-add.h");
-    }
   else if (!strcmp (tag, "version"))
     {
       putchar ('\"');