diff -c2 -d -P -r include_h/clib/graphics_protos.h include/clib/graphics_protos.h *** include_h/clib/graphics_protos.h Tue Aug 1 12:38:46 2000 --- include/clib/graphics_protos.h Tue Aug 1 12:38:19 2000 *************** *** 240,244 **** ULONG GetBPen( struct RastPort *rp ); ULONG GetDrMd( struct RastPort *rp ); ! ULONG GetOutlinePen( struct RastPort *rp ); void LoadRGB32( struct ViewPort *vp, ULONG *table ); ULONG SetChipRev( unsigned long want ); --- 240,244 ---- ULONG GetBPen( struct RastPort *rp ); ULONG GetDrMd( struct RastPort *rp ); ! ULONG GetOPen( struct RastPort *rp ); void LoadRGB32( struct ViewPort *vp, ULONG *table ); ULONG SetChipRev( unsigned long want ); diff -c2 -d -P -r include_h/devices/cd.h include/devices/cd.h *** include_h/devices/cd.h Tue Aug 1 12:38:48 2000 --- include/devices/cd.h Tue Aug 1 12:38:20 2000 *************** *** 231,235 **** LONG Actual; /* bytes transferred */ APTR IntData; /* interrupt server data segment */ ! VOID (*IntCode)(); /* interrupt server code entry */ }; --- 231,235 ---- LONG Actual; /* bytes transferred */ APTR IntData; /* interrupt server data segment */ ! VOID (*IntCode)(void); /* interrupt server code entry */ }; diff -c2 -d -P -r include_h/devices/printer.h include/devices/printer.h *** include_h/devices/printer.h Tue Aug 1 12:38:48 2000 --- include/devices/printer.h Tue Aug 1 12:38:20 2000 *************** *** 27,30 **** --- 27,34 ---- #endif + #ifndef EXEC_DEVICES_H + #include "exec/devices.h" + #endif + #define PRD_RAWWRITE (CMD_NONSTD+0) #define PRD_PRTCOMMAND (CMD_NONSTD+1) diff -c2 -d -P -r include_h/devices/prtbase.h include/devices/prtbase.h *** include_h/devices/prtbase.h Tue Aug 1 12:38:48 2000 --- include/devices/prtbase.h Tue Aug 1 12:38:20 2000 *************** *** 69,74 **** struct PrinterSegment *pd_SegmentData; UBYTE *pd_PrintBuf; /* the raster print buffer */ ! int (*pd_PWrite)(); /* the write function */ ! int (*pd_PBothReady)(); /* write function's done */ union { /* port I/O request 0 */ struct IOExtPar pd_p0; --- 69,74 ---- struct PrinterSegment *pd_SegmentData; UBYTE *pd_PrintBuf; /* the raster print buffer */ ! int (*pd_PWrite)(void); /* the write function */ ! int (*pd_PBothReady)(void); /* write function's done */ union { /* port I/O request 0 */ struct IOExtPar pd_p0; *************** *** 133,140 **** struct PrinterExtendedData { char *ped_PrinterName; /* printer name, null terminated */ ! VOID (*ped_Init)(); /* called after LoadSeg */ ! VOID (*ped_Expunge)(); /* called before UnLoadSeg */ ! int (*ped_Open)(); /* called at OpenDevice */ ! VOID (*ped_Close)(); /* called at CloseDevice */ UBYTE ped_PrinterClass; /* printer class */ UBYTE ped_ColorClass; /* color class */ --- 133,140 ---- struct PrinterExtendedData { char *ped_PrinterName; /* printer name, null terminated */ ! VOID (*ped_Init)(void); /* called after LoadSeg */ ! VOID (*ped_Expunge)(void); /* called before UnLoadSeg */ ! int (*ped_Open)(void); /* called at OpenDevice */ ! VOID (*ped_Close)(void); /* called at CloseDevice */ UBYTE ped_PrinterClass; /* printer class */ UBYTE ped_ColorClass; /* color class */ *************** *** 147,152 **** UWORD ped_YDotsInch; /* vertical dot density */ char ***ped_Commands; /* printer text command table */ ! int (*ped_DoSpecial)(); /* special command handler */ ! int (*ped_Render)(); /* raster render function */ LONG ped_TimeoutSecs; /* good write timeout */ /* the following only exists if the segment version is >= 33 */ --- 147,152 ---- UWORD ped_YDotsInch; /* vertical dot density */ char ***ped_Commands; /* printer text command table */ ! int (*ped_DoSpecial)(void); /* special command handler */ ! int (*ped_Render)(void); /* raster render function */ LONG ped_TimeoutSecs; /* good write timeout */ /* the following only exists if the segment version is >= 33 */ *************** *** 155,159 **** /* the following only exists if the segment version is >= 34 */ /* ptr to conversion function for all chars */ ! int (*ped_ConvFunc)(); }; --- 155,159 ---- /* the following only exists if the segment version is >= 34 */ /* ptr to conversion function for all chars */ ! int (*ped_ConvFunc)(void); }; diff -c2 -d -P -r include_h/devices/prtgfx.h include/devices/prtgfx.h *** include_h/devices/prtgfx.h Tue Aug 1 12:38:48 2000 --- include/devices/prtgfx.h Tue Aug 1 12:38:20 2000 *************** *** 31,35 **** struct PrtInfo { /* printer info */ ! int (*pi_render)(); /* PRIVATE - DO NOT USE! */ struct RastPort *pi_rp; /* PRIVATE - DO NOT USE! */ struct RastPort *pi_temprp; /* PRIVATE - DO NOT USE! */ --- 31,35 ---- struct PrtInfo { /* printer info */ ! int (*pi_render)(void); /* PRIVATE - DO NOT USE! */ struct RastPort *pi_rp; /* PRIVATE - DO NOT USE! */ struct RastPort *pi_temprp; /* PRIVATE - DO NOT USE! */ diff -c2 -d -P -r include_h/dos/dosextens.h include/dos/dosextens.h *** include_h/dos/dosextens.h Tue Aug 1 12:38:49 2000 --- include/dos/dosextens.h Tue Aug 1 12:38:21 2000 *************** *** 58,62 **** BPTR pr_HomeDir; /* Home directory of executing program */ LONG pr_Flags; /* flags telling dos about process */ ! void (*pr_ExitCode)(); /* code to call on exit of program or NULL */ LONG pr_ExitData; /* Passed as an argument to pr_ExitCode. */ UBYTE *pr_Arguments; /* Arguments passed to the process at start */ --- 58,62 ---- BPTR pr_HomeDir; /* Home directory of executing program */ LONG pr_Flags; /* flags telling dos about process */ ! void (*pr_ExitCode)(void); /* code to call on exit of program or NULL */ LONG pr_ExitData; /* Passed as an argument to pr_ExitCode. */ UBYTE *pr_Arguments; /* Arguments passed to the process at start */ diff -c2 -d -P -r include_h/exec/interrupts.h include/exec/interrupts.h *** include_h/exec/interrupts.h Tue Aug 1 12:38:50 2000 --- include/exec/interrupts.h Tue Aug 1 12:38:21 2000 *************** *** 23,27 **** struct Node is_Node; APTR is_Data; /* server data segment */ ! VOID (*is_Code)(); /* server code entry */ }; --- 23,27 ---- struct Node is_Node; APTR is_Data; /* server data segment */ ! VOID (*is_Code)(void); /* server code entry */ }; *************** *** 29,33 **** struct IntVector { /* For EXEC use ONLY! */ APTR iv_Data; ! VOID (*iv_Code)(); struct Node *iv_Node; }; --- 29,33 ---- struct IntVector { /* For EXEC use ONLY! */ APTR iv_Data; ! VOID (*iv_Code)(void); struct Node *iv_Node; }; diff -c2 -d -P -r include_h/exec/tasks.h include/exec/tasks.h *** include_h/exec/tasks.h Tue Aug 1 12:38:50 2000 --- include/exec/tasks.h Tue Aug 1 12:38:21 2000 *************** *** 41,46 **** APTR tc_SPLower; /* stack lower bound */ APTR tc_SPUpper; /* stack upper bound + 2*/ ! VOID (*tc_Switch)(); /* task losing CPU */ ! VOID (*tc_Launch)(); /* task getting CPU */ struct List tc_MemEntry; /* Allocated memory. Freed by RemTask() */ APTR tc_UserData; /* For use by the task; no restrictions! */ --- 41,46 ---- APTR tc_SPLower; /* stack lower bound */ APTR tc_SPUpper; /* stack upper bound + 2*/ ! VOID (*tc_Switch)(void); /* task losing CPU */ ! VOID (*tc_Launch)(void); /* task getting CPU */ struct List tc_MemEntry; /* Allocated memory. Freed by RemTask() */ APTR tc_UserData; /* For use by the task; no restrictions! */ diff -c2 -d -P -r include_h/fd/amigaguide_lib.fd include/fd/amigaguide_lib.fd *** include_h/fd/amigaguide_lib.fd Tue Aug 1 12:38:42 2000 --- include/fd/amigaguide_lib.fd Tue Aug 1 12:38:28 2000 *************** *** 14,18 **** amigaguidePrivate2()() ##public ! OpenAmigaGuideA(nag,*)(a0/a1) OpenAmigaGuideAsyncA(nag,attrs)(a0,d0) CloseAmigaGuide(cl)(a0) --- 14,18 ---- amigaguidePrivate2()() ##public ! OpenAmigaGuideA(nag,attr)(a0/a1) OpenAmigaGuideAsyncA(nag,attrs)(a0,d0) CloseAmigaGuide(cl)(a0) Only in include_h/fd: amigaguide_lib.fd.info Only in include_h/fd: asl_lib.fd.info Only in include_h/fd: battclock_lib.fd.info Only in include_h/fd: battmem_lib.fd.info Only in include_h/fd: bullet_lib.fd.info Only in include_h/fd: cardres_lib.fd.info Only in include_h/fd: cia_lib.fd.info Only in include_h/fd: colorwheel_lib.fd.info Only in include_h/fd: commodities_lib.fd.info Only in include_h/fd: console_lib.fd.info Only in include_h/fd: datatypes_lib.fd.info Only in include_h/fd: disk_lib.fd.info Only in include_h/fd: diskfont_lib.fd.info Only in include_h/fd: dos_lib.fd.info Only in include_h/fd: dtclass_lib.fd.info Only in include_h/fd: exec_lib.fd.info Only in include_h/fd: expansion_lib.fd.info Only in include_h/fd: gadtools_lib.fd.info diff -c2 -d -P -r include_h/fd/graphics_lib.fd include/fd/graphics_lib.fd *** include_h/fd/graphics_lib.fd Tue Aug 1 12:38:44 2000 --- include/fd/graphics_lib.fd Tue Aug 1 12:38:26 2000 *************** *** 155,159 **** GetBPen(rp)(a0) GetDrMd(rp)(a0) ! GetOutlinePen(rp)(a0) LoadRGB32(vp,table)(a0/a1) SetChipRev(want)(d0) --- 155,159 ---- GetBPen(rp)(a0) GetDrMd(rp)(a0) ! GetOPen(rp)(a0) LoadRGB32(vp,table)(a0/a1) SetChipRev(want)(d0) Only in include_h/fd: graphics_lib.fd.info Only in include_h/fd: icon_lib.fd.info Only in include_h/fd: iffparse_lib.fd.info Only in include_h/fd: input_lib.fd.info Only in include_h/fd: intuition_lib.fd.info Only in include_h/fd: keymap_lib.fd.info Only in include_h/fd: layers_lib.fd.info Only in include_h/fd: locale_lib.fd.info Only in include_h/fd: lowlevel_lib.fd.info Only in include_h/fd: mathffp_lib.fd.info Only in include_h/fd: mathieeedoubbas_lib.fd.info Only in include_h/fd: mathieeedoubtrans_lib.fd.info Only in include_h/fd: mathieeesingbas_lib.fd.info Only in include_h/fd: mathieeesingtrans_lib.fd.info Only in include_h/fd: mathtrans_lib.fd.info Only in include_h/fd: misc_lib.fd.info Only in include_h/fd: nonvolatile_lib.fd.info Only in include_h/fd: potgo_lib.fd.info Only in include_h/fd: ramdrive_lib.fd.info Only in include_h/fd: realtime_lib.fd.info Only in include_h/fd: rexxsyslib_lib.fd.info Only in include_h/fd: timer_lib.fd.info Only in include_h/fd: translator_lib.fd.info Only in include_h/fd: utility_lib.fd.info Only in include_h/fd: wb_lib.fd.info diff -c2 -d -P -r include_h/graphics/gels.h include/graphics/gels.h *** include_h/graphics/gels.h Tue Aug 1 12:38:50 2000 --- include/graphics/gels.h Tue Aug 1 12:38:22 2000 *************** *** 191,195 **** struct AnimComp *PrevSeq; ! WORD (*AnimCRoutine)(); /* address of special animation procedure */ WORD YTrans; /* initial y translation (if this is a component) */ --- 191,195 ---- struct AnimComp *PrevSeq; ! WORD (*AnimCRoutine)(void); /* address of special animation procedure */ WORD YTrans; /* initial y translation (if this is a component) */ *************** *** 220,224 **** WORD RingYTrans, RingXTrans; /* ring translation values */ ! WORD (*AnimORoutine)(); /* address of special animation procedure */ --- 220,224 ---- WORD RingYTrans, RingXTrans; /* ring translation values */ ! WORD (*AnimORoutine)(void); /* address of special animation procedure */ *************** *** 263,267 **** struct collTable { ! int (*collPtrs[16])(); }; --- 263,267 ---- struct collTable { ! int (*collPtrs[16])(void); }; diff -c2 -d -P -r include_h/graphics/gfxnodes.h include/graphics/gfxnodes.h *** include_h/graphics/gfxnodes.h Tue Aug 1 12:38:51 2000 --- include/graphics/gfxnodes.h Tue Aug 1 12:38:22 2000 *************** *** 24,28 **** UBYTE xln_Subtype; LONG xln_Library; ! LONG (*xln_Init)(); }; --- 24,28 ---- UBYTE xln_Subtype; LONG xln_Library; ! LONG (*xln_Init)(void); }; diff -c2 -d -P -r include_h/graphics/graphint.h include/graphics/graphint.h *** include_h/graphics/graphint.h Tue Aug 1 12:38:51 2000 --- include/graphics/graphint.h Tue Aug 1 12:38:22 2000 *************** *** 20,25 **** struct Node is_Node; struct Isrvstr *Iptr; /* passed to srvr by os */ ! int (*code)(); ! int (*ccode)(); int Carg; }; --- 20,25 ---- struct Node is_Node; struct Isrvstr *Iptr; /* passed to srvr by os */ ! int (*code)(void); ! int (*ccode)(void); int Carg; }; diff -c2 -d -P -r include_h/graphics/monitor.h include/graphics/monitor.h *** include_h/graphics/monitor.h Tue Aug 1 12:38:51 2000 --- include/graphics/monitor.h Tue Aug 1 12:38:22 2000 *************** *** 36,54 **** struct SpecialMonitor *ms_Special; UWORD ms_OpenCount; ! LONG (*ms_transform)(); ! LONG (*ms_translate)(); ! LONG (*ms_scale)(); UWORD ms_xoffset; UWORD ms_yoffset; struct Rectangle ms_LegalView; ! LONG (*ms_maxoscan)(); /* maximum legal overscan */ ! LONG (*ms_videoscan)(); /* video display overscan */ UWORD DeniseMinDisplayColumn; ULONG DisplayCompatible; struct List DisplayInfoDataBase; struct SignalSemaphore DisplayInfoDataBaseSemaphore; ! LONG (*ms_MrgCop)(); ! LONG (*ms_LoadView)(); ! LONG (*ms_KillView)(); }; --- 36,54 ---- struct SpecialMonitor *ms_Special; UWORD ms_OpenCount; ! LONG (*ms_transform)(void); ! LONG (*ms_translate)(void); ! LONG (*ms_scale)(void); UWORD ms_xoffset; UWORD ms_yoffset; struct Rectangle ms_LegalView; ! LONG (*ms_maxoscan)(void); /* maximum legal overscan */ ! LONG (*ms_videoscan)(void); /* video display overscan */ UWORD DeniseMinDisplayColumn; ULONG DisplayCompatible; struct List DisplayInfoDataBase; struct SignalSemaphore DisplayInfoDataBaseSemaphore; ! LONG (*ms_MrgCop)(void); ! LONG (*ms_LoadView)(void); ! LONG (*ms_KillView)(void); }; *************** *** 160,167 **** struct ExtendedNode spm_Node; UWORD spm_Flags; ! LONG (*do_monitor)(); ! LONG (*reserved1)(); ! LONG (*reserved2)(); ! LONG (*reserved3)(); struct AnalogSignalInterval hblank; struct AnalogSignalInterval vblank; --- 160,167 ---- struct ExtendedNode spm_Node; UWORD spm_Flags; ! LONG (*do_monitor)(void); ! LONG (*reserved1)(void); ! LONG (*reserved2)(void); ! LONG (*reserved3)(void); struct AnalogSignalInterval hblank; struct AnalogSignalInterval vblank; diff -c2 -d -P -r include_h/hardware/blit.h include/hardware/blit.h *** include_h/hardware/blit.h Tue Aug 1 12:38:51 2000 --- include/hardware/blit.h Tue Aug 1 12:38:23 2000 *************** *** 89,97 **** { struct bltnode *n; ! int (*function)(); char stat; short blitsize; short beamsync; ! int (*cleanup)(); }; --- 89,97 ---- { struct bltnode *n; ! int (*function)(void); char stat; short blitsize; short beamsync; ! int (*cleanup)(void); }; diff -c2 -d -P -r include_h/intuition/imageclass.h include/intuition/imageclass.h *** include_h/intuition/imageclass.h Tue Aug 1 12:38:52 2000 --- include/intuition/imageclass.h Tue Aug 1 12:38:23 2000 *************** *** 186,192 **** --- 186,194 ---- }; + #ifndef FRAMEF_SPECIFY #define FRAMEF_SPECIFY (1<<0) /* Make do with the dimensions of FrameBox * provided. */ + #endif /* IM_DRAW, IM_DRAWFRAME */ diff -c2 -d -P -r include_h/libraries/commodities.h include/libraries/commodities.h *** include_h/libraries/commodities.h Tue Aug 1 12:38:52 2000 --- include/libraries/commodities.h Tue Aug 1 12:38:24 2000 *************** *** 78,82 **** /* Pointer to a function returning a LONG */ ! typedef LONG (*PFL)(); --- 78,82 ---- /* Pointer to a function returning a LONG */ ! typedef LONG (*PFL)(void); diff -c2 -d -P -r include_h/libraries/mathieeedp.h include/libraries/mathieeedp.h *** include_h/libraries/mathieeedp.h Tue Aug 1 12:38:53 2000 --- include/libraries/mathieeedp.h Tue Aug 1 12:38:24 2000 *************** *** 51,55 **** #define tanh IEEEDPTanh ! double IEEEDPTan(),IEEEDPAtan(); double IEEEDPCos(),IEEEDPACos(); --- 51,55 ---- #define tanh IEEEDPTanh ! #if 0 double IEEEDPTan(),IEEEDPAtan(); double IEEEDPCos(),IEEEDPACos(); *************** *** 74,77 **** --- 74,78 ---- double IEEEDPFloor(); double IEEEDPCeil(); + #endif #endif /* LIBRARIES_MATHIEEEDP_H */ diff -c2 -d -P -r include_h/libraries/mathieeesp.h include/libraries/mathieeesp.h *** include_h/libraries/mathieeesp.h Tue Aug 1 12:38:53 2000 --- include/libraries/mathieeesp.h Tue Aug 1 12:38:24 2000 *************** *** 53,57 **** #define tanh IEEESPTanh ! float IEEESPTan(),IEEESPAtan(); float IEEESPCos(),IEEESPACos(); --- 53,57 ---- #define tanh IEEESPTanh ! #if 0 float IEEESPTan(),IEEESPAtan(); float IEEESPCos(),IEEESPACos(); *************** *** 76,79 **** --- 76,80 ---- float IEEESPFloor(); float IEEESPCeil(); + #endif #endif /* LIBRARIES_MATHIEEESP_H */ diff -c2 -d -P -r include_h/libraries/mathlibrary.h include/libraries/mathlibrary.h *** include_h/libraries/mathlibrary.h Tue Aug 1 12:38:53 2000 --- include/libraries/mathlibrary.h Tue Aug 1 12:38:24 2000 *************** *** 21,26 **** struct Library MathIEEEBase_LibNode; unsigned char MathIEEEBase_reserved[18]; ! int (*MathIEEEBase_TaskOpenLib)(); ! int (*MathIEEEBase_TaskCloseLib)(); /* This structure may be extended in the future */ }; --- 21,26 ---- struct Library MathIEEEBase_LibNode; unsigned char MathIEEEBase_reserved[18]; ! int (*MathIEEEBase_TaskOpenLib)(void); ! int (*MathIEEEBase_TaskCloseLib)(void); /* This structure may be extended in the future */ }; diff -c2 -d -P -r include_h/libraries/mathresource.h include/libraries/mathresource.h *** include_h/libraries/mathresource.h Tue Aug 1 12:38:53 2000 --- include/libraries/mathresource.h Tue Aug 1 12:38:24 2000 *************** *** 36,45 **** unsigned short MathIEEEResource_Flags; unsigned short *MathIEEEResource_BaseAddr; /* ptr to 881 if exists */ ! void (*MathIEEEResource_DblBasInit)(); ! void (*MathIEEEResource_DblTransInit)(); ! void (*MathIEEEResource_SglBasInit)(); ! void (*MathIEEEResource_SglTransInit)(); ! void (*MathIEEEResource_ExtBasInit)(); ! void (*MathIEEEResource_ExtTransInit)(); }; --- 36,45 ---- unsigned short MathIEEEResource_Flags; unsigned short *MathIEEEResource_BaseAddr; /* ptr to 881 if exists */ ! void (*MathIEEEResource_DblBasInit)(void); ! void (*MathIEEEResource_DblTransInit)(void); ! void (*MathIEEEResource_SglBasInit)(void); ! void (*MathIEEEResource_SglTransInit)(void); ! void (*MathIEEEResource_ExtBasInit)(void); ! void (*MathIEEEResource_ExtTransInit)(void); }; diff -c2 -d -P -r include_h/resources/mathresource.h include/resources/mathresource.h *** include_h/resources/mathresource.h Tue Aug 1 12:38:54 2000 --- include/resources/mathresource.h Tue Aug 1 12:38:25 2000 *************** *** 36,45 **** unsigned short MathIEEEResource_Flags; unsigned short *MathIEEEResource_BaseAddr; /* ptr to 881 if exists */ ! void (*MathIEEEResource_DblBasInit)(); ! void (*MathIEEEResource_DblTransInit)(); ! void (*MathIEEEResource_SglBasInit)(); ! void (*MathIEEEResource_SglTransInit)(); ! void (*MathIEEEResource_ExtBasInit)(); ! void (*MathIEEEResource_ExtTransInit)(); }; --- 36,45 ---- unsigned short MathIEEEResource_Flags; unsigned short *MathIEEEResource_BaseAddr; /* ptr to 881 if exists */ ! void (*MathIEEEResource_DblBasInit)(void); ! void (*MathIEEEResource_DblTransInit)(void); ! void (*MathIEEEResource_SglBasInit)(void); ! void (*MathIEEEResource_SglTransInit)(void); ! void (*MathIEEEResource_ExtBasInit)(void); ! void (*MathIEEEResource_ExtTransInit)(void); }; diff -c2 -d -P -r include_h/utility/hooks.h include/utility/hooks.h *** include_h/utility/hooks.h Tue Aug 1 12:38:55 2000 --- include/utility/hooks.h Tue Aug 1 12:38:26 2000 *************** *** 29,34 **** { struct MinNode h_MinNode; ! ULONG (*h_Entry)(); /* assembler entry point */ ! ULONG (*h_SubEntry)(); /* often HLL entry point */ APTR h_Data; /* owner specific */ }; --- 29,34 ---- { struct MinNode h_MinNode; ! ULONG (*h_Entry)(void); /* assembler entry point */ ! ULONG (*h_SubEntry)(void); /* often HLL entry point */ APTR h_Data; /* owner specific */ }; *************** *** 37,41 **** * hook.h_SubEntry = (HOOKFUNC)AFunction */ ! typedef unsigned long (*HOOKFUNC)(); /* Hook calling conventions. --- 37,41 ---- * hook.h_SubEntry = (HOOKFUNC)AFunction */ ! typedef unsigned long (*HOOKFUNC)(void); /* Hook calling conventions.