>From 43510f76ddfb2d8b3faf8f2b85baf6cfb22f203e Mon Sep 17 00:00:00 2001
From: Alessio Vanni
Date: Tue, 6 Aug 2019 19:28:31 +0200
Subject: [PATCH] Remove platform.h and set project data
---
src/ext/ext_api.c | 12 +++++++++++-
src/ext/gnunet-ext.c | 32 +++++++++++++++++++++++++++++++-
src/ext/test_ext_api.c | 12 +++++++++++-
3 files changed, 53 insertions(+), 3 deletions(-)
diff --git a/src/ext/ext_api.c b/src/ext/ext_api.c
index 65637d5..365dd89 100644
--- a/src/ext/ext_api.c
+++ b/src/ext/ext_api.c
@@ -23,7 +23,17 @@
* @brief API for ext
* @author
*/
-#include
+#include "gnunet_ext_config.h"
+#include
+
+#if WINDOWS
+#define FDTYPE HANDLE
+#define SOCKTYPE SOCKET
+#else
+#define FDTYPE int
+#define SOCKTYPE int
+#endif
+
#include
#include "gnunet_ext_service.h"
diff --git a/src/ext/gnunet-ext.c b/src/ext/gnunet-ext.c
index 36fc02b..0df3fe7 100644
--- a/src/ext/gnunet-ext.c
+++ b/src/ext/gnunet-ext.c
@@ -23,12 +23,39 @@
* @brief ext tool
* @author
*/
-#include
+#include "gnunet_ext_config.h"
+#include
+
+#if WINDOWS
+#define FDTYPE HANDLE
+#define SOCKTYPE SOCKET
+#else
+#define FDTYPE int
+#define SOCKTYPE int
+#endif
+
+#include
#include
#include "gnunet_ext_service.h"
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",
+};
+
/**
* Main function that will be run by the scheduler.
*
@@ -60,6 +87,9 @@ main (int argc, char *const *argv)
static const struct GNUNET_GETOPT_CommandLineOption options[] = {
GNUNET_GETOPT_OPTION_END
};
+
+ GNUNET_OS_init(&gnunetext_pd);
+
return (GNUNET_OK ==
GNUNET_PROGRAM_run (argc,
argv,
diff --git a/src/ext/test_ext_api.c b/src/ext/test_ext_api.c
index 75a7cc4..e69dca0 100644
--- a/src/ext/test_ext_api.c
+++ b/src/ext/test_ext_api.c
@@ -21,7 +21,17 @@
* @file ext/test_ext_api.c
* @brief testcase for ext_api.c
*/
-#include
+#include "gnunet_ext_config.h"
+#include
+
+#if WINDOWS
+#define FDTYPE HANDLE
+#define SOCKTYPE SOCKET
+#else
+#define FDTYPE int
+#define SOCKTYPE int
+#endif
+
#include
#include "gnunet_ext_service.h"
--
2.21.0