GitLab has been upgraded to 13.3.6. If you encounter any issues mail code@riscosopen.org

Commit e706bc6b authored by Jeffrey Lee's avatar Jeffrey Lee Committed by ROOL

Remove some redundant #includes

TCPIPLibs-5_69's version of sys/time.h now includes the TCPIPLibs
version of sys/types.h, which contains duplicate/conflicting definitions
of CLib's clock_t & time_t from time.h.

DWCDriver's port.c was including both sys/time.h and time.h, which means
that for the past few weeks Norcroft has been throwing errors about the
duplicate definitions (but still producing a valid object).

However both of those includes appear to be redundant, so just remove
them. Resulting binary is unchanged.


Version 0.36. Not tagged
parent d6652a69
......@@ -4,18 +4,18 @@
*
*/
#define Module_MajorVersion_CMHG 0.36
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 29 Feb 2020
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 22 Apr 2020
#define Module_MajorVersion "0.36"
#define Module_Version 36
#define Module_MinorVersion ""
#define Module_Date "29 Feb 2020"
#define Module_Date "22 Apr 2020"
#define Module_ApplicationDate "29-Feb-20"
#define Module_ApplicationDate "22-Apr-20"
#define Module_ComponentName "DWCDriver"
#define Module_FullVersion "0.36"
#define Module_HelpVersion "0.36 (29 Feb 2020)"
#define Module_HelpVersion "0.36 (22 Apr 2020)"
#define Module_LibraryVersionInfo "0:36"
......@@ -15,7 +15,6 @@
#include <stddef.h>
#include <string.h>
#include <stdio.h>
#include <time.h>
#include <stdlib.h>
#include <stdint.h>
#include <stdarg.h>
......@@ -24,7 +23,6 @@
#include "callx/callx.h"
#include "swis.h"
#include "sys/callout.h"
#include "sys/time.h"
#include "Global/HALEntries.h"
#include "AsmUtils/irqs.h"
......
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