Commit 8fb5cc3a authored by Robert Sprowson's avatar Robert Sprowson
Browse files

Build fixes for cc 5.70

The built in headers with cc 5.70 include new non-ANSI defines in <errno.h> which clash with some of the names in TCPIPLibs:sys/errno.h
This change extends the practice in some of the disc based utils to not include <errno.h> when __unix is not defined (since the symbol for errno is also declared as extern at the top of the TCPIPLibs copy) to avoid the duplication and hence the clash.
Built with cc 5.70, but no runtime testing.

Version 5.51. Tagged as 'Internet-5_51'
parent cc603b7e
......@@ -20,7 +20,11 @@
/* This is partially based on a program sent to me
from Bruce Ediger on 20 Apr 2001 */
#ifdef RISCOS_TWEAK
#include <sys/errno.h>
#else
#include <errno.h>
#endif
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
......
......@@ -68,7 +68,9 @@ static const char rcsid[] =
#include <arpa/inet.h>
#include <err.h>
#ifdef __unix
#include <errno.h>
#endif
#include <netdb.h>
#include <stdio.h>
#include <stdlib.h>
......
......@@ -50,7 +50,9 @@ static char sccsid[] = "@(#)main.c 8.4 (Berkeley) 3/1/94";
#include <ctype.h>
#include <err.h>
#ifdef __unix
#include <errno.h>
#endif
#include <kvm.h>
#include <limits.h>
#include <netdb.h>
......
......@@ -59,7 +59,9 @@ static char sccsid[] = "@(#)ns.c 8.1 (Berkeley) 6/6/93";
#include <netns/spp_debug.h>
#include <nlist.h>
#ifdef __unix
#include <errno.h>
#endif
#include <stdio.h>
#include <string.h>
#include "netstat.h"
......
......@@ -30,8 +30,8 @@
#include <stdlib.h>
#include <unistd.h>
#include <ctype.h>
#include <errno.h>
#ifndef __riscos
#include <errno.h>
#include <syslog.h>
#endif
#include <signal.h>
......
......@@ -30,8 +30,8 @@
#include <stdlib.h>
#include <unistd.h>
#include <ctype.h>
#include <errno.h>
#ifndef __riscos
#include <errno.h>
#include <syslog.h>
#endif
#include <signal.h>
......
......@@ -132,8 +132,8 @@ static const char rcsid[] =
#include <ctype.h>
#include <err.h>
#include <errno.h>
#ifndef __riscos
#include <errno.h>
#include <memory.h>
#endif
#include <netdb.h>
......
......@@ -52,7 +52,9 @@ static const char rcsid[] =
#include <ctype.h>
#include <err.h>
#ifdef __unix
#include <errno.h>
#endif
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
......
/* (5.50)
/* (5.51)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 5.50
#define Module_MajorVersion_CMHG 5.51
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 19 Sep 2012
#define Module_Date_CMHG 26 May 2013
#define Module_MajorVersion "5.50"
#define Module_Version 550
#define Module_MajorVersion "5.51"
#define Module_Version 551
#define Module_MinorVersion ""
#define Module_Date "19 Sep 2012"
#define Module_Date "26 May 2013"
#define Module_ApplicationDate "19-Sep-12"
#define Module_ApplicationDate "26-May-13"
#define Module_ComponentName "Internet"
#define Module_ComponentPath "mixed/RiscOS/Sources/SystemRes/Internet"
#define Module_FullVersion "5.50"
#define Module_HelpVersion "5.50 (19 Sep 2012)"
#define Module_LibraryVersionInfo "5:50"
#define Module_FullVersion "5.51"
#define Module_HelpVersion "5.51 (26 May 2013)"
#define Module_LibraryVersionInfo "5:51"
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment