>From bc4dc3be1f71d7f8022cd268daa15627d59fb9fa Mon Sep 17 00:00:00 2001
From: Alessio Vanni <address@hidden>
Date: Thu, 8 Aug 2019 16:31:06 +0200
Subject: [PATCH] gnunet-ext is part of GNU

Also remove platform.h from the service.
---
 src/ext/gnunet-ext.c         | 26 ++++++++++++++------------
 src/ext/gnunet-service-ext.c | 12 +++++++++++-
 2 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/src/ext/gnunet-ext.c b/src/ext/gnunet-ext.c
index 0df3fe7..f18e351 100644
--- a/src/ext/gnunet-ext.c
+++ b/src/ext/gnunet-ext.c
@@ -43,18 +43,20 @@ static int ret;
 /**
  * This structure holds informations about the project.
  */
-static const struct GNUNET_OS_ProjectData gnunetext_pd = {
-     .libname = "libgnunetext",
-     .project_dirname = "gnunet-ext",
-     .binary_name = "gnunet-ext",
-     .env_varname = "GNUNET_EXT_PREFIX",
-     .base_config_varname = "GNUNET_EXT_BASE_CONFIG",
-     .bug_email = "address@hidden",
-     .homepage = "http://www.gnu.org/s/gnunet/",
-     .config_file = "gnunet-ext.conf",
-     .user_config_file = "~/.config/gnunet-ext.conf",
-     .version = "1.0",
-};
+static const struct GNUNET_OS_ProjectData gnunetext_pd =
+  {
+   .libname = "libgnunetext",
+   .project_dirname = "gnunet-ext",
+   .binary_name = "gnunet-ext",
+   .env_varname = "GNUNET_EXT_PREFIX",
+   .base_config_varname = "GNUNET_EXT_BASE_CONFIG",
+   .bug_email = "address@hidden",
+   .homepage = "http://www.gnu.org/s/gnunet/",
+   .config_file = "gnunet-ext.conf",
+   .user_config_file = "~/.config/gnunet-ext.conf",
+   .version = "1.0",
+   .is_gnu = 1,
+  };
 
 /**
  * Main function that will be run by the scheduler.
diff --git a/src/ext/gnunet-service-ext.c b/src/ext/gnunet-service-ext.c
index d292eac..aa43933 100644
--- a/src/ext/gnunet-service-ext.c
+++ b/src/ext/gnunet-service-ext.c
@@ -23,7 +23,17 @@
  * @brief ext service implementation
  * @author Christian Grothoff
  */
-#include <gnunet/platform.h>
+#include "gnunet_ext_config.h"
+#include <stddef.h>
+
+#if WINDOWS
+#define FDTYPE HANDLE
+#define SOCKTYPE SOCKET
+#else
+#define FDTYPE int
+#define SOCKTYPE int
+#endif
+
 #include <gnunet/gnunet_util_lib.h>
 #include "gnunet_protocols_ext.h"
 
-- 
2.21.0