Patch to make DefMod compile with SWILib
Timothy Baldwin
tim at reinhouse.freeserve.co.uk
Tue Jul 24 19:47:12 BST 2001
And make DefMod use the new oslib directory.
Should be self explaintory.
(PS Belated apologies for send a large patch back in January)
Create a directory !OSLib.SwiLib.oslib and copy the contents
of !OSLib.SwiLib in there.
Apply this patch with:
patch -p2 < this_file
patch can be obtained from http://www.youmustbejoking.demon.co.uk/
diff -urN OSLib_dist.!OSLib.Support.c.callback
OSLib_patched.!OSLib.Support.c.callback
--- OSLib_dist.!OSLib.Support.c.callback Thu May 18 15:01:00 2000
+++ OSLib_patched.!OSLib.Support.c.callback Fri Jul 20 13:20:24 2001
@@ -36,7 +36,7 @@
#include <stdlib.h>
/*From OSLib*/
-#include "types.h"
+#include "oslib/types.h"
/*From Support*/
#include "callback.h"
diff -urN OSLib_dist.!OSLib.Support.c.lookup
OSLib_patched.!OSLib.Support.c.lookup
--- OSLib_dist.!OSLib.Support.c.lookup Mon Oct 23 14:44:18 2000
+++ OSLib_patched.!OSLib.Support.c.lookup Fri Jul 20 13:20:25 2001
@@ -26,8 +26,8 @@
#include <string.h>
/*From OSLib*/
-#include "os.h"
-#include "territory.h"
+#include "oslib/os.h"
+#include "oslib/territory.h"
/*From Support*/
#include "lookup.h"
diff -urN OSLib_dist.!OSLib.Support.c.resource
OSLib_patched.!OSLib.Support.c.resource
--- OSLib_dist.!OSLib.Support.c.resource Thu May 18 16:36:44 2000
+++ OSLib_patched.!OSLib.Support.c.resource Fri Jul 20 13:20:26 2001
@@ -42,11 +42,11 @@
#include <string.h>
/*From OSLib*/
-#include "font.h"
-#include "messagetrans.h"
-#include "os.h"
-#include "osfile.h"
-#include "wimp.h"
+#include "oslib/font.h"
+#include "oslib/messagetrans.h"
+#include "oslib/os.h"
+#include "oslib/osfile.h"
+#include "oslib/wimp.h"
/*From Support*/
#include "lookup.h"
diff -urN OSLib_dist.!OSLib.Support.c.riscos
OSLib_patched.!OSLib.Support.c.riscos
--- OSLib_dist.!OSLib.Support.c.riscos Thu May 18 15:01:02 2000
+++ OSLib_patched.!OSLib.Support.c.riscos Fri Jul 20 13:20:28 2001
@@ -26,12 +26,12 @@
#include <string.h>
/*From OSLib*/
-#include "types.h"
-#include "messagetrans.h"
-#include "macros.h"
-#include "os.h"
-#include "territory.h"
-#include "wimp.h"
+#include "oslib/types.h"
+#include "oslib/messagetrans.h"
+#include "oslib/macros.h"
+#include "oslib/os.h"
+#include "oslib/territory.h"
+#include "oslib/wimp.h"
/*From Support*/
#include "m.h"
diff -urN OSLib_dist.!OSLib.Support.h.callback
OSLib_patched.!OSLib.Support.h.callback
--- OSLib_dist.!OSLib.Support.h.callback Thu May 18 15:01:04 2000
+++ OSLib_patched.!OSLib.Support.h.callback Fri Jul 20 13:20:30 2001
@@ -26,11 +26,11 @@
*/
#if !defined types_H
- #include "types.h"
+ #include "oslib/types.h"
#endif
#ifndef os_H
- #include "os.h"
+ #include "oslib/os.h"
#endif
#ifndef trace_H
diff -urN OSLib_dist.!OSLib.Support.h.hostfs
OSLib_patched.!OSLib.Support.h.hostfs
--- OSLib_dist.!OSLib.Support.h.hostfs Thu May 18 15:01:04 2000
+++ OSLib_patched.!OSLib.Support.h.hostfs Fri Jul 20 13:20:31 2001
@@ -22,11 +22,11 @@
*/
#ifndef types_H
- #include "types.h"
+ #include "oslib/types.h"
#endif
#ifndef os_H
- #include "os.h"
+ #include "oslib/os.h"
#endif
/**********************************
diff -urN OSLib_dist.!OSLib.Support.h.lookup
OSLib_patched.!OSLib.Support.h.lookup
--- OSLib_dist.!OSLib.Support.h.lookup Mon Oct 23 14:44:14 2000
+++ OSLib_patched.!OSLib.Support.h.lookup Fri Jul 20 13:20:32 2001
@@ -24,7 +24,7 @@
*/
#ifndef os_H
- #include "os.h"
+ #include "oslib/os.h"
#endif
/* Implement ation of an abstract lookup table consisting of a token
diff -urN OSLib_dist.!OSLib.Support.h.riscos
OSLib_patched.!OSLib.Support.h.riscos
--- OSLib_dist.!OSLib.Support.h.riscos Thu May 18 15:01:04 2000
+++ OSLib_patched.!OSLib.Support.h.riscos Fri Jul 20 13:20:34 2001
@@ -23,11 +23,11 @@
/*From OSLib*/
#ifndef os_H
- #include "os.h"
+ #include "oslib/os.h"
#endif
#ifndef territory_H
- #include "territory.h"
+ #include "oslib/territory.h"
#endif
/* Function to change the territory in use for |riscos_{scan/format}_fixed.
diff -urN OSLib_dist.!OSLib.Support.h.trace
OSLib_patched.!OSLib.Support.h.trace
--- OSLib_dist.!OSLib.Support.h.trace Thu May 18 15:01:04 2000
+++ OSLib_patched.!OSLib.Support.h.trace Fri Jul 20 13:20:35 2001
@@ -28,7 +28,7 @@
#endif
#ifndef os_H
- #include "os.h"
+ #include "oslib/os.h"
#endif
#if TRACE
diff -urN OSLib_dist.!OSLib.SwiLib.oslib.h.econet
OSLib_patched.!OSLib.SwiLib.oslib.h.econet
--- OSLib_dist.!OSLib.SwiLib.oslib.h.econet Sun Feb 7 06:28:16 2106
+++ OSLib_patched.!OSLib.SwiLib.oslib.h.econet Fri Jul 20 13:20:36 2001
@@ -0,0 +1,60 @@
+#ifndef econet_H
+#define econet_H
+
+/*OSLib---efficient, type-safe, transparent, extensible,\n"
+ register-safe A P I coverage of RISC O S*/
+/*This file Copyright © 2001 Timothy Baldwin*/
+
+/*
+ OSLib is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 1, or (at your option)
+ any later version.
+
+ OSLib is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this programme; if not, write to the Free Software
+ Foundation, Inc, 675 Mass Ave, Cambridge, MA 02139, U S A.
+*/
+
+#include <kernel.h>
+#include <swis.h>
+
+#ifndef types_H
+ #include "oslib/types.h"
+#endif
+
+#define econet_STATUS_TRANSMITTED ((econet_status) 0x0u)
+#define econet_STATUS_LINE_JAMMED ((econet_status) 0x1u)
+#define econet_STATUS_NET_ERROR ((econet_status) 0x2u)
+#define econet_STATUS_NOT_LISTENING ((econet_status) 0x3u)
+#define econet_STATUS_NO_CLOCK ((econet_status) 0x4u)
+#define econet_STATUS_TX_READY ((econet_status) 0x5u)
+#define econet_STATUS_TRANSMITTING ((econet_status) 0x6u)
+#define econet_STATUS_RX_READY ((econet_status) 0x7u)
+#define econet_STATUS_RECEIVING ((econet_status) 0x8u)
+#define econet_STATUS_RECEIVED ((econet_status) 0x9u)
+#define econet_STATUS_NO_REPLY ((econet_status) 0xAu)
+#define econet_STATUS_ESCAPE ((econet_status) 0xBu)
+#define econet_STATUS_NOT_PRESENT ((econet_status) 0xCu)
+
+typedef int econet_status;
+
+#define xeconet_do_transmit(flags, port, station, net, buffer, size, \
+ count, delay, status, nonlocal) \
+ _swix (Econet_DoTransmit, _IN (0) | _IN (1) | _IN (2) | _IN (3) | \
+ _IN (4) | _IN (5) | _IN (6) | _IN (7) | _OUT (0) | _OUT (4), \
+ (byte) (port), (byte) (station), (byte) (net), (byte *) (buffer), \
+ (int) (size), (int) (count), (int) (delay), \
+ (econet_status *) (status), (osbool *) (nonlocal))
+
+#define xeconet_read_station_number(s, end, station, net) \
+ _swix (Econet_ReadStationNumber, _IN (0) | _OUT (0) | _OUT (1) | \
+ _OUT (2), \
+ (char const *) (s), (char **) (end), (int *) (station), (int) (net))
+
+#endif
diff -urN OSLib_dist.!OSLib.SwiLib.oslib.h.fileswitch
OSLib_patched.!OSLib.SwiLib.oslib.h.fileswitch
--- OSLib_dist.!OSLib.SwiLib.oslib.h.fileswitch Thu May 18 14:50:44 2000
+++ OSLib_patched.!OSLib.SwiLib.oslib.h.fileswitch Fri Jul 20 13:20:38 2001
@@ -22,11 +22,11 @@
*/
#ifndef types_H
-#include "types.h"
+#include "oslib/types.h"
#endif
#ifndef os_H
-#include "os.h"
+#include "oslib/os.h"
#endif
/**********************************
diff -urN OSLib_dist.!OSLib.SwiLib.oslib.h.font
OSLib_patched.!OSLib.SwiLib.oslib.h.font
--- OSLib_dist.!OSLib.SwiLib.oslib.h.font Thu May 18 14:50:44 2000
+++ OSLib_patched.!OSLib.SwiLib.oslib.h.font Fri Jul 20 13:20:39 2001
@@ -4,11 +4,11 @@
#include <swis.h>
#ifndef types_H
- #include "types.h"
+ #include "oslib/types.h"
#endif
#ifndef os_H
- #include "os.h"
+ #include "oslib/os.h"
#endif
#define font_COMMAND_NUL 0
diff -urN OSLib_dist.!OSLib.SwiLib.oslib.h.hostfs
OSLib_patched.!OSLib.SwiLib.oslib.h.hostfs
--- OSLib_dist.!OSLib.SwiLib.oslib.h.hostfs Thu May 18 14:50:44 2000
+++ OSLib_patched.!OSLib.SwiLib.oslib.h.hostfs Fri Jul 20 13:20:40 2001
@@ -4,7 +4,7 @@
#include <swis.h>
#ifndef types_H
- #include "types.h"
+ #include "oslib/types.h"
#endif
#undef HostFS_HostVdu
diff -urN OSLib_dist.!OSLib.SwiLib.oslib.h.messagetrans
OSLib_patched.!OSLib.SwiLib.oslib.h.messagetrans
--- OSLib_dist.!OSLib.SwiLib.oslib.h.messagetrans Thu May 18 14:50:44 2000
+++ OSLib_patched.!OSLib.SwiLib.oslib.h.messagetrans Fri Jul 20 13:20:42 2001
@@ -25,7 +25,7 @@
#include <swis.h>
#ifndef types_H
- #include "types.h"
+ #include "oslib/types.h"
#endif
#define messagetrans_DIRECT_ACCESS (1 << 0)
@@ -75,6 +75,15 @@
_IN (4) | _IN (5) | _IN (6) | _IN (7), \
(_kernel_oserror *) (error), (messagetrans_control_block *) (cb), \
(char *) (buffer), (int) (size_in), (char *) (arg0), \
+ (char *) (arg1), (char *) (arg2), (char *) (arg3))
+
+/* TEB 20010109 */
+#define messagetrans_error_lookup(error, cb, buffer, size_in, arg0, arg1, \
+ arg2, arg3) \
+ _swi (MessageTrans_ErrorLookup, _IN (0) | _IN (1) | _IN (2) | _IN (3) | \
+ _IN (4) | _IN (5) | _IN (6) | _IN (7), \
+ (_kernel_oserror *) (error), (messagetrans_control_block *) (cb), \
+ (char *) (buffer), (int) (size_in), (char *) (arg0), \
(char *) (arg1), (char *) (arg2), (char *) (arg3))
#define xmessagetrans_gs_lookup(cb, token, buffer, size_in, arg0, arg1, \
diff -urN OSLib_dist.!OSLib.SwiLib.oslib.h.os
OSLib_patched.!OSLib.SwiLib.oslib.h.os
--- OSLib_dist.!OSLib.SwiLib.oslib.h.os Thu Nov 30 12:04:46 2000
+++ OSLib_patched.!OSLib.SwiLib.oslib.h.os Fri Jul 20 13:20:44 2001
@@ -25,7 +25,7 @@
#include <swis.h>
#ifndef types_H
- #include "types.h"
+ #include "oslib/types.h"
#endif
#define osbyte_IN_KEY ((byte) 129)
@@ -52,6 +52,8 @@
typedef _kernel_oserror os_error;
#define os_ERROR_LIMIT 252
+#define error_ESCAPE 0x11u /* TEB 20010107 */
+#define error_STK_OFLO 0x163u /* TEB 20010107 */
#define os_VDU_NULL ((char) '\x00')
#define os_VDU_CHAR_TO_PRINTER ((char) '\x01')
diff -urN OSLib_dist.!OSLib.SwiLib.oslib.h.osargs
OSLib_patched.!OSLib.SwiLib.oslib.h.osargs
--- OSLib_dist.!OSLib.SwiLib.oslib.h.osargs Thu May 18 14:50:44 2000
+++ OSLib_patched.!OSLib.SwiLib.oslib.h.osargs Fri Jul 20 13:20:45 2001
@@ -22,15 +22,15 @@
*/
#ifndef types_H
- #include "types.h"
+ #include "oslib/types.h"
#endif
#ifndef fileswitch_H
- #include "fileswitch.h"
+ #include "oslib/fileswitch.h"
#endif
#ifndef os_H
- #include "os.h"
+ #include "oslib/os.h"
#endif
#define OSArgs_ReadPtr 0x0
diff -urN OSLib_dist.!OSLib.SwiLib.oslib.h.osfile
OSLib_patched.!OSLib.SwiLib.oslib.h.osfile
--- OSLib_dist.!OSLib.SwiLib.oslib.h.osfile Fri Dec 8 18:14:08 2000
+++ OSLib_patched.!OSLib.SwiLib.oslib.h.osfile Fri Jul 20 13:20:46 2001
@@ -24,11 +24,11 @@
#include <swis.h>
#ifndef types_H
- #include "types.h"
+ #include "oslib/types.h"
#endif
#ifndef fileswitch_H
- #include "fileswitch.h"
+ #include "oslib/fileswitch.h"
#endif
#define OSFile_Load 255
diff -urN OSLib_dist.!OSLib.SwiLib.oslib.h.osfind
OSLib_patched.!OSLib.SwiLib.oslib.h.osfind
--- OSLib_dist.!OSLib.SwiLib.oslib.h.osfind Thu May 18 14:50:46 2000
+++ OSLib_patched.!OSLib.SwiLib.oslib.h.osfind Fri Jul 20 13:20:48 2001
@@ -22,15 +22,15 @@
*/
#ifndef types_H
- #include "types.h"
+ #include "oslib/types.h"
#endif
#ifndef fileswitch_H
- #include "fileswitch.h"
+ #include "oslib/fileswitch.h"
#endif
#ifndef os_H
- #include "os.h"
+ #include "oslib/os.h"
#endif
#define OSFind_Close 0x0
diff -urN OSLib_dist.!OSLib.SwiLib.oslib.h.osgbpb
OSLib_patched.!OSLib.SwiLib.oslib.h.osgbpb
--- OSLib_dist.!OSLib.SwiLib.oslib.h.osgbpb Thu May 18 14:50:46 2000
+++ OSLib_patched.!OSLib.SwiLib.oslib.h.osgbpb Fri Jul 20 13:20:49 2001
@@ -22,15 +22,15 @@
*/
#ifndef types_H
- #include "types.h"
+ #include "oslib/types.h"
#endif
#ifndef fileswitch_H
- #include "fileswitch.h"
+ #include "oslib/fileswitch.h"
#endif
#ifndef os_H
- #include "os.h"
+ #include "oslib/os.h"
#endif
#define OSGBPB_WriteAt 0x1
diff -urN OSLib_dist.!OSLib.SwiLib.oslib.h.osmodule
OSLib_patched.!OSLib.SwiLib.oslib.h.osmodule
--- OSLib_dist.!OSLib.SwiLib.oslib.h.osmodule Thu May 18 14:50:46 2000
+++ OSLib_patched.!OSLib.SwiLib.oslib.h.osmodule Fri Jul 20 13:20:51 2001
@@ -22,11 +22,11 @@
*/
#ifndef types_H
- #include "types.h"
+ #include "oslib/types.h"
#endif
#ifndef os_H
- #include "os.h"
+ #include "oslib/os.h"
#endif
#define OSModule_Alloc 0x6
diff -urN OSLib_dist.!OSLib.SwiLib.oslib.h.osspriteop
OSLib_patched.!OSLib.SwiLib.oslib.h.osspriteop
--- OSLib_dist.!OSLib.SwiLib.oslib.h.osspriteop Thu May 18 14:50:46 2000
+++ OSLib_patched.!OSLib.SwiLib.oslib.h.osspriteop Fri Jul 20 13:20:52 2001
@@ -22,11 +22,11 @@
*/
#if !defined types_H
- #include "types.h"
+ #include "oslib/types.h"
#endif
#ifndef os_H
- #include "os.h"
+ #include "oslib/os.h"
#endif
#define OSSpriteOp_ScreenSave 2
diff -urN OSLib_dist.!OSLib.SwiLib.oslib.h.taskwindow
OSLib_patched.!OSLib.SwiLib.oslib.h.taskwindow
--- OSLib_dist.!OSLib.SwiLib.oslib.h.taskwindow Thu May 18 14:50:46 2000
+++ OSLib_patched.!OSLib.SwiLib.oslib.h.taskwindow Fri Jul 20 13:20:53 2001
@@ -25,11 +25,11 @@
*/
#if !defined types_H
- #include "types.h"
+ #include "oslib/types.h"
#endif
#ifndef os_H
- #include "os.h"
+ #include "oslib/os.h"
#endif
#define TaskWindowTaskInfo_WindowTask 0x0
diff -urN OSLib_dist.!OSLib.SwiLib.oslib.h.territory
OSLib_patched.!OSLib.SwiLib.oslib.h.territory
--- OSLib_dist.!OSLib.SwiLib.oslib.h.territory Thu May 18 14:50:46 2000
+++ OSLib_patched.!OSLib.SwiLib.oslib.h.territory Fri Jul 20 13:20:55 2001
@@ -24,7 +24,7 @@
#include <swis.h>
#ifndef types_H
- #include "types.h"
+ #include "oslib/types.h"
#endif
typedef int territory_t;
diff -urN OSLib_dist.!OSLib.SwiLib.oslib.h.wimp
OSLib_patched.!OSLib.SwiLib.oslib.h.wimp
--- OSLib_dist.!OSLib.SwiLib.oslib.h.wimp Thu May 18 14:50:46 2000
+++ OSLib_patched.!OSLib.SwiLib.oslib.h.wimp Fri Jul 20 13:20:56 2001
@@ -24,15 +24,15 @@
#include <swis.h>
#ifndef types_H
- #include "types.h"
+ #include "oslib/types.h"
#endif
#ifndef os_H
- #include "os.h"
+ #include "oslib/os.h"
#endif
#ifndef osspriteop_H
- #include "osspriteop.h"
+ #include "oslib/osspriteop.h"
#endif
#define wimp_ERROR_BOX_SHORT_TITLE ((bits) 0x10u)
diff -urN OSLib_dist.!OSLib.Tools.DefMod.Makefile
OSLib_patched.!OSLib.Tools.DefMod.Makefile
--- OSLib_dist.!OSLib.Tools.DefMod.Makefile Sun Feb 25 13:59:06 2001
+++ OSLib_patched.!OSLib.Tools.DefMod.Makefile Fri Jul 20 13:20:59 2001
@@ -1,16 +1,16 @@
-VPATH=@ <OSLib$SupportDir>
+VPATH=@ <OSLib$SupportLibDir>.X <OSLib$SupportDir>
-INCLUDES = OSLibSupport:,OSLibSWILib:,CLib:
+INCLUDES = OSLibSupport:,OSLibSWILib:,C:
CC = cc -I${INCLUDES} -facfK -wp -throwback -depend !Depend
LINK = Link
-LIBS = OSLibSupport:o.OSLibSupport CLib:o.Stubs OSLib:o.OSLib
+LIBS = C:o.Stubs
#Lists of derived objects
C = c.defmod
OBJS = o.trace o.asmhelp o.callback o.chelp o.def o.defmod o.cheader o.hdr \
- o.lookup o.objasm o.realloc o.resource o.riscos o.riscosa o.cstrong
+ o.X o.lookup o.objasm o.realloc o.resource o.riscos o.riscosa o.cstrong
#Externally visible targets
all: DefMod
@@ -31,6 +31,10 @@
Squeeze DefMod
Access DefMod WR/R
+o.defmod: c.defmod
+ @Echo This file may take a few minutes to compile...
+ ${CC} -W -c -o o.defmod c.defmod
+
#General rules
.SUFFIXES: .o .c .y .asm
.c.o:; ${CC} -c -o $@ $<
diff -urN OSLib_dist.!OSLib.Tools.DefMod.c.Asmhelp
OSLib_patched.!OSLib.Tools.DefMod.c.Asmhelp
--- OSLib_dist.!OSLib.Tools.DefMod.c.Asmhelp Sun Oct 1 13:55:16 2000
+++ OSLib_patched.!OSLib.Tools.DefMod.c.Asmhelp Fri Jul 20 13:21:00 2001
@@ -25,7 +25,7 @@
#include <string.h>
#include <kernel.h> /* TV 980115 */
-#include "os.h"
+#include "oslib/os.h"
#include "lookup.h"
diff -urN OSLib_dist.!OSLib.Tools.DefMod.c.Cheader
OSLib_patched.!OSLib.Tools.DefMod.c.Cheader
--- OSLib_dist.!OSLib.Tools.DefMod.c.Cheader Tue Nov 21 15:08:14 2000
+++ OSLib_patched.!OSLib.Tools.DefMod.c.Cheader Fri Jul 20 13:21:02 2001
@@ -26,9 +26,9 @@
#include <time.h>
#include <kernel.h> /* TV 980115 */
-#include "types.h"
-#include "macros.h"
-#include "os.h"
+#include "oslib/types.h"
+#include "oslib/macros.h"
+#include "oslib/os.h"
#include "lookup.h"
diff -urN OSLib_dist.!OSLib.Tools.DefMod.c.Chelp
OSLib_patched.!OSLib.Tools.DefMod.c.Chelp
--- OSLib_dist.!OSLib.Tools.DefMod.c.Chelp Sun Oct 1 13:54:06 2000
+++ OSLib_patched.!OSLib.Tools.DefMod.c.Chelp Fri Jul 20 13:21:05 2001
@@ -25,8 +25,8 @@
#include <string.h>
#include <kernel.h> /* TV 980115 */
-#include "macros.h"
-#include "os.h"
+#include "oslib/macros.h"
+#include "oslib/os.h"
#include "lookup.h"
diff -urN OSLib_dist.!OSLib.Tools.DefMod.c.Cstrong
OSLib_patched.!OSLib.Tools.DefMod.c.Cstrong
--- OSLib_dist.!OSLib.Tools.DefMod.c.Cstrong Tue Jan 30 16:47:14 2001
+++ OSLib_patched.!OSLib.Tools.DefMod.c.Cstrong Fri Jul 20 13:21:07 2001
@@ -38,10 +38,10 @@
#include <stddef.h>
/*From OSLib*/
-#include "macros.h"
-#include "os.h"
-#include "osfile.h"
-#include "territory.h"
+#include "oslib/macros.h"
+#include "oslib/os.h"
+#include "oslib/osfile.h"
+#include "oslib/territory.h"
/*From Support*/
#include "x.h"
diff -urN OSLib_dist.!OSLib.Tools.DefMod.c.Hdr
OSLib_patched.!OSLib.Tools.DefMod.c.Hdr
--- OSLib_dist.!OSLib.Tools.DefMod.c.Hdr Sat Sep 30 10:22:32 2000
+++ OSLib_patched.!OSLib.Tools.DefMod.c.Hdr Fri Jul 20 13:21:10 2001
@@ -26,8 +26,8 @@
#include <time.h>
#include "kernel.h" /* TV 980115 */
-#include "macros.h"
-#include "os.h"
+#include "oslib/macros.h"
+#include "oslib/os.h"
#include "lookup.h"
diff -urN OSLib_dist.!OSLib.Tools.DefMod.c.Objasm
OSLib_patched.!OSLib.Tools.DefMod.c.Objasm
--- OSLib_dist.!OSLib.Tools.DefMod.c.Objasm Tue Jan 30 17:26:34 2001
+++ OSLib_patched.!OSLib.Tools.DefMod.c.Objasm Fri Jul 20 13:21:13 2001
@@ -28,10 +28,10 @@
#include <time.h>
/*From OSLib*/
-#include "os.h"
-#include "osfile.h"
-#include "taskwindow.h"
-#include "wimp.h"
+#include "oslib/os.h"
+#include "oslib/osfile.h"
+#include "oslib/taskwindow.h"
+#include "oslib/wimp.h"
/*From Support*/
#include "x.h"
diff -urN OSLib_dist.!OSLib.Tools.DefMod.y.Defmod
OSLib_patched.!OSLib.Tools.DefMod.y.Defmod
--- OSLib_dist.!OSLib.Tools.DefMod.y.Defmod Fri Dec 8 18:23:50 2000
+++ OSLib_patched.!OSLib.Tools.DefMod.y.Defmod Fri Jul 20 13:21:16 2001
@@ -37,11 +37,11 @@
#include <swis.h>
/*From OSLib*/
- #include "types.h"
- #include "fileswitch.h"
- #include "macros.h"
- #include "os.h"
- #include "osfind.h"
+ #include "oslib/types.h"
+ #include "oslib/fileswitch.h"
+ #include "oslib/macros.h"
+ #include "oslib/os.h"
+ #include "oslib/osfind.h"
/*From Support*/
#include "hostfs.h"
More information about the oslib-user
mailing list