diff options
author | Christian Grothoff <christian@grothoff.org> | 2019-11-10 23:10:40 +0100 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2019-11-10 23:10:50 +0100 |
commit | 7ff9290162ddcad90b27a266588dcd7ade2b414e (patch) | |
tree | 66fee48ece79a6150e6f3c18f6ee283ce9c1a844 | |
parent | 98a7419e66b93c17ad28fa7621652cc469f6d36e (diff) | |
download | gnunet-7ff9290162ddcad90b27a266588dcd7ade2b414e.tar.gz gnunet-7ff9290162ddcad90b27a266588dcd7ade2b414e.zip |
get rid of SOCKTYPE and FDTYPE
-rw-r--r-- | src/arm/arm_api.c | 4 | ||||
-rw-r--r-- | src/arm/gnunet-service-arm.c | 2 | ||||
-rw-r--r-- | src/include/platform.h | 3 | ||||
-rw-r--r-- | src/transport/gnunet-helper-transport-bluetooth.c | 1 | ||||
-rw-r--r-- | src/transport/gnunet-helper-transport-wlan.c | 2 | ||||
-rw-r--r-- | src/util/network.c | 2 | ||||
-rw-r--r-- | src/util/os_priority.c | 6 |
7 files changed, 7 insertions, 13 deletions
diff --git a/src/arm/arm_api.c b/src/arm/arm_api.c index 4c6ce3240..1c402a8e0 100644 --- a/src/arm/arm_api.c +++ b/src/arm/arm_api.c | |||
@@ -662,8 +662,8 @@ start_arm_service (struct GNUNET_ARM_Handle *h, | |||
662 | char *config; | 662 | char *config; |
663 | char *loprefix; | 663 | char *loprefix; |
664 | char *lopostfix; | 664 | char *lopostfix; |
665 | SOCKTYPE ld[2]; | 665 | int ld[2]; |
666 | SOCKTYPE *lsocks; | 666 | int *lsocks; |
667 | 667 | ||
668 | if (NULL == sigfd) | 668 | if (NULL == sigfd) |
669 | { | 669 | { |
diff --git a/src/arm/gnunet-service-arm.c b/src/arm/gnunet-service-arm.c index 6b6264757..01bc48960 100644 --- a/src/arm/gnunet-service-arm.c +++ b/src/arm/gnunet-service-arm.c | |||
@@ -756,7 +756,7 @@ start_process (struct ServiceList *sl, | |||
756 | int use_debug; | 756 | int use_debug; |
757 | int is_simple_service; | 757 | int is_simple_service; |
758 | struct ServiceListeningInfo *sli; | 758 | struct ServiceListeningInfo *sli; |
759 | SOCKTYPE *lsocks; | 759 | int *lsocks; |
760 | unsigned int ls; | 760 | unsigned int ls; |
761 | char *binary; | 761 | char *binary; |
762 | char *quotedbinary; | 762 | char *quotedbinary; |
diff --git a/src/include/platform.h b/src/include/platform.h index dd5e28760..0dddd9741 100644 --- a/src/include/platform.h +++ b/src/include/platform.h | |||
@@ -236,9 +236,6 @@ atoll (const char *nptr); | |||
236 | #define MAKE_UNALIGNED(val) val | 236 | #define MAKE_UNALIGNED(val) val |
237 | #endif | 237 | #endif |
238 | 238 | ||
239 | #define FDTYPE int | ||
240 | #define SOCKTYPE int | ||
241 | |||
242 | /** | 239 | /** |
243 | * The termination signal | 240 | * The termination signal |
244 | */ | 241 | */ |
diff --git a/src/transport/gnunet-helper-transport-bluetooth.c b/src/transport/gnunet-helper-transport-bluetooth.c index 9b56d0922..74806e630 100644 --- a/src/transport/gnunet-helper-transport-bluetooth.c +++ b/src/transport/gnunet-helper-transport-bluetooth.c | |||
@@ -21,7 +21,6 @@ | |||
21 | */ | 21 | */ |
22 | #include "gnunet_config.h" | 22 | #include "gnunet_config.h" |
23 | 23 | ||
24 | #define SOCKTYPE int | ||
25 | #include <bluetooth/bluetooth.h> | 24 | #include <bluetooth/bluetooth.h> |
26 | #include <bluetooth/hci.h> | 25 | #include <bluetooth/hci.h> |
27 | #include <bluetooth/hci_lib.h> | 26 | #include <bluetooth/hci_lib.h> |
diff --git a/src/transport/gnunet-helper-transport-wlan.c b/src/transport/gnunet-helper-transport-wlan.c index 68adadbe8..2d5a2cf46 100644 --- a/src/transport/gnunet-helper-transport-wlan.c +++ b/src/transport/gnunet-helper-transport-wlan.c | |||
@@ -110,8 +110,6 @@ | |||
110 | * parts taken from aircrack-ng, parts changend. | 110 | * parts taken from aircrack-ng, parts changend. |
111 | */ | 111 | */ |
112 | #include "gnunet_config.h" | 112 | #include "gnunet_config.h" |
113 | #define SOCKTYPE int | ||
114 | #define FDTYPE int | ||
115 | #include <sys/socket.h> | 113 | #include <sys/socket.h> |
116 | #include <sys/ioctl.h> | 114 | #include <sys/ioctl.h> |
117 | #include <sys/types.h> | 115 | #include <sys/types.h> |
diff --git a/src/util/network.c b/src/util/network.c index 99de5a7aa..2b407d97c 100644 --- a/src/util/network.c +++ b/src/util/network.c | |||
@@ -633,7 +633,7 @@ GNUNET_NETWORK_socket_free_memory_only_ (struct GNUNET_NETWORK_Handle *desc) | |||
633 | * @return NULL on error (including not supported on target platform) | 633 | * @return NULL on error (including not supported on target platform) |
634 | */ | 634 | */ |
635 | struct GNUNET_NETWORK_Handle * | 635 | struct GNUNET_NETWORK_Handle * |
636 | GNUNET_NETWORK_socket_box_native (SOCKTYPE fd) | 636 | GNUNET_NETWORK_socket_box_native (int fd) |
637 | { | 637 | { |
638 | struct GNUNET_NETWORK_Handle *ret; | 638 | struct GNUNET_NETWORK_Handle *ret; |
639 | 639 | ||
diff --git a/src/util/os_priority.c b/src/util/os_priority.c index 3b4858ca4..d93e0d44f 100644 --- a/src/util/os_priority.c +++ b/src/util/os_priority.c | |||
@@ -346,7 +346,7 @@ start_process (int pipe_control, | |||
346 | struct GNUNET_DISK_PipeHandle *pipe_stdin, | 346 | struct GNUNET_DISK_PipeHandle *pipe_stdin, |
347 | struct GNUNET_DISK_PipeHandle *pipe_stdout, | 347 | struct GNUNET_DISK_PipeHandle *pipe_stdout, |
348 | struct GNUNET_DISK_PipeHandle *pipe_stderr, | 348 | struct GNUNET_DISK_PipeHandle *pipe_stderr, |
349 | const SOCKTYPE *lsocks, | 349 | const int *lsocks, |
350 | const char *filename, | 350 | const char *filename, |
351 | char *const argv[]) | 351 | char *const argv[]) |
352 | { | 352 | { |
@@ -725,7 +725,7 @@ GNUNET_OS_start_process (int pipe_control, | |||
725 | struct GNUNET_OS_Process * | 725 | struct GNUNET_OS_Process * |
726 | GNUNET_OS_start_process_v (int pipe_control, | 726 | GNUNET_OS_start_process_v (int pipe_control, |
727 | enum GNUNET_OS_InheritStdioFlags std_inheritance, | 727 | enum GNUNET_OS_InheritStdioFlags std_inheritance, |
728 | const SOCKTYPE *lsocks, | 728 | const int *lsocks, |
729 | const char *filename, | 729 | const char *filename, |
730 | char *const argv[]) | 730 | char *const argv[]) |
731 | { | 731 | { |
@@ -761,7 +761,7 @@ GNUNET_OS_start_process_v (int pipe_control, | |||
761 | struct GNUNET_OS_Process * | 761 | struct GNUNET_OS_Process * |
762 | GNUNET_OS_start_process_s (int pipe_control, | 762 | GNUNET_OS_start_process_s (int pipe_control, |
763 | unsigned int std_inheritance, | 763 | unsigned int std_inheritance, |
764 | const SOCKTYPE *lsocks, | 764 | const int *lsocks, |
765 | const char *filename, | 765 | const char *filename, |
766 | ...) | 766 | ...) |
767 | { | 767 | { |