From 0c22fcffe3cc83df5d977b2bdeda4f3d894689d5 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sat, 15 Aug 2026 17:28:32 +0200 Subject: [PATCH] config-riscos.h: delete handcrafted RISC OS config header, in favor of autotools According to the content of the latest downloadable builds available at (from 2022): https://www.riscos.info/packages/src/Network/, these builds used autotools, not the handcrafted header. Also the handcrafted header did not see an update (that I could find) since 0866c1b52dcff1f872860a42183397b4e8f6dedf (2002-04-08), other than source-wide maintenance updates. Closes #22598 --- lib/Makefile.am | 2 +- lib/config-riscos.h | 138 -------------------------------------------- lib/curl_setup.h | 4 -- 3 files changed, 1 insertion(+), 143 deletions(-) delete mode 100644 lib/config-riscos.h diff --git a/lib/Makefile.am b/lib/Makefile.am index 8a2bd4e68e..b2e64c788e 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -28,7 +28,7 @@ include Makefile.inc CMAKE_DIST = CMakeLists.txt curl_config-cmake.h.in -EXTRA_DIST = config-mac.h config-os400.h config-riscos.h config-win32.h \ +EXTRA_DIST = config-mac.h config-os400.h config-win32.h \ curl_config.h.in $(LIB_RCFILES) libcurl.def $(CMAKE_DIST) Makefile.soname \ optiontable.pl diff --git a/lib/config-riscos.h b/lib/config-riscos.h deleted file mode 100644 index 358544fb3c..0000000000 --- a/lib/config-riscos.h +++ /dev/null @@ -1,138 +0,0 @@ -#ifndef HEADER_CURL_CONFIG_RISCOS_H -#define HEADER_CURL_CONFIG_RISCOS_H -/*************************************************************************** - * _ _ ____ _ - * Project ___| | | | _ \| | - * / __| | | | |_) | | - * | (__| |_| | _ <| |___ - * \___|\___/|_| \_\_____| - * - * Copyright (C) Daniel Stenberg, , et al. - * - * This software is licensed as described in the file COPYING, which - * you should have received as part of this distribution. The terms - * are also available at https://curl.se/docs/copyright.html. - * - * You may opt to use, copy, modify, merge, publish, distribute and/or sell - * copies of the Software, and permit persons to whom the Software is - * furnished to do so, under the terms of the COPYING file. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - * SPDX-License-Identifier: curl - * - ***************************************************************************/ - -/* ================================================================ */ -/* Hand crafted config file for RISC OS */ -/* ================================================================ */ - -/* Define cpu-machine-OS */ -#ifndef CURL_OS -#define CURL_OS "ARM-RISC OS" -#endif - -/* Define if you want the built-in manual */ -#define USE_MANUAL - -/* Define if struct sockaddr_in6 has the sin6_scope_id member */ -#define HAVE_SOCKADDR_IN6_SIN6_SCOPE_ID 1 - -/* Define if you have the alarm function. */ -#define HAVE_ALARM - -/* Define if you have the header file. */ -#define HAVE_ARPA_INET_H - -/* Define if you have the header file. */ -#define HAVE_FCNTL_H - -/* Define if getaddrinfo exists and works */ -#define HAVE_GETADDRINFO - -/* Define if you have the `gethostname' function. */ -#define HAVE_GETHOSTNAME - -/* Define if you have the `gettimeofday' function. */ -#define HAVE_GETTIMEOFDAY - -/* Define if you have the `timeval' struct. */ -#define HAVE_STRUCT_TIMEVAL - -/* Define if you have the header file. */ -#define HAVE_NETDB_H - -/* Define if you have the header file. */ -#define HAVE_NETINET_IN_H - -/* Define if you have the header file. */ -#define HAVE_NET_IF_H - -/* Define if you have the `signal' function. */ -#define HAVE_SIGNAL - -/* Define if you have the `socket' function. */ -#define HAVE_SOCKET - -/* Define if you have the `stricmp' function. */ -#define HAVE_STRICMP - -/* Define if you have the header file. */ -#define HAVE_SYS_TYPES_H - -/* Define if you have the header file. */ -#define HAVE_TERMIOS_H - -/* Define if you have the header file. */ -#define HAVE_UNISTD_H - -/* The size of `int', as computed by sizeof. */ -#define SIZEOF_INT 4 - -/* The size of `size_t', as computed by sizeof. */ -#define SIZEOF_SIZE_T 4 - -/* Define if you have a working ioctl FIONBIO function. */ -#define HAVE_IOCTL_FIONBIO - -/* to disable LDAP */ -#define CURL_DISABLE_LDAP - -/* Define if you have the recv function. */ -#define HAVE_RECV 1 - -/* Define to the type of arg 1 for recv. */ -#define RECV_TYPE_ARG1 int - -/* Define to the type of arg 2 for recv. */ -#define RECV_TYPE_ARG2 void * - -/* Define to the type of arg 3 for recv. */ -#define RECV_TYPE_ARG3 size_t - -/* Define to the type of arg 4 for recv. */ -#define RECV_TYPE_ARG4 int - -/* Define to the function return type for recv. */ -#define RECV_TYPE_RETV ssize_t - -/* Define if you have the send function. */ -#define HAVE_SEND 1 - -/* Define to the type of arg 1 for send. */ -#define SEND_TYPE_ARG1 int - -/* Define to the type of arg 2 for send. */ -#define SEND_TYPE_ARG2 void * - -/* Define to the type of arg 3 for send. */ -#define SEND_TYPE_ARG3 size_t - -/* Define to the type of arg 4 for send. */ -#define SEND_TYPE_ARG4 int - -/* Define to the function return type for send. */ -#define SEND_TYPE_RETV ssize_t - -#endif /* HEADER_CURL_CONFIG_RISCOS_H */ diff --git a/lib/curl_setup.h b/lib/curl_setup.h index 38b4706cb9..d43baf3b38 100644 --- a/lib/curl_setup.h +++ b/lib/curl_setup.h @@ -149,10 +149,6 @@ # include "config-mac.h" #endif -#ifdef __riscos__ -# include "config-riscos.h" -#endif - #ifdef __OS400__ # include "config-os400.h" #endif