Amiga: delete the .p prototype headers
amidos.p, amiwind.p, winami.p duplicated and partly contradicted winproto.h. Switch amidos.c and amigst.c to winproto.h.
This commit is contained in:
+2
-10
@@ -83,16 +83,8 @@ free_nhuuid(void)
|
||||
}
|
||||
}
|
||||
|
||||
/* Prototypes */
|
||||
#ifndef CROSS_TO_AMIGA
|
||||
#include "NH:sys/amiga/amiwind.p"
|
||||
#include "NH:sys/amiga/winami.p"
|
||||
#include "NH:sys/amiga/amidos.p"
|
||||
#else
|
||||
#include "amiwind.p"
|
||||
#include "winami.p"
|
||||
#include "amidos.p"
|
||||
#endif
|
||||
#include "winext.h"
|
||||
#include "winproto.h"
|
||||
|
||||
|
||||
extern char Initialized;
|
||||
|
||||
@@ -1,43 +0,0 @@
|
||||
/* NetHack 3.6 amidos.p $NHDT-Date: 1432512796 2015/05/25 00:13:16 $ $NHDT-Branch: master $:$NHDT-Revision: 1.7 $ */
|
||||
/* Copyright (c) Kenneth Lorber, Bethesda, Maryland, 1992, 1993. */
|
||||
/* NetHack may be freely redistributed. See license for details. */
|
||||
|
||||
/* amidos.c */
|
||||
void flushout (void);
|
||||
#ifndef getuid
|
||||
int getuid (void);
|
||||
#endif
|
||||
#ifndef getpid
|
||||
int getpid (void);
|
||||
#endif
|
||||
#ifndef getlogin
|
||||
char *getlogin (void);
|
||||
#endif
|
||||
#ifndef abs
|
||||
int abs(int );
|
||||
#endif
|
||||
int tgetch (void);
|
||||
int dosh (void);
|
||||
void amiga_self_assign (void);
|
||||
long freediskspace(char *);
|
||||
long filesize(char *);
|
||||
void eraseall(const char * , const char *);
|
||||
char *CopyFile(const char * , const char *);
|
||||
void copybones(int );
|
||||
void playwoRAMdisk (void);
|
||||
int saveDiskPrompt(int );
|
||||
void gameDiskPrompt (void);
|
||||
void append_slash(char *);
|
||||
void getreturn(const char *);
|
||||
#ifndef msmsg
|
||||
void msmsg( const char *, ... );
|
||||
#endif
|
||||
#if !defined(__SASC_60) && !defined(_DCC) && !defined(CROSS_TO_AMIGA)
|
||||
int chdir(char *);
|
||||
#endif
|
||||
#ifndef strcmpi
|
||||
int strcmpi(char * , char *);
|
||||
#endif
|
||||
#if !defined(memcmp) && !defined(AZTEC_C) && !defined(_DCC) && !defined(__GNUC__)
|
||||
int memcmp(unsigned char * , unsigned char * , int );
|
||||
#endif
|
||||
+3
-9
@@ -21,14 +21,8 @@
|
||||
#include "winprocs.h"
|
||||
#include "winami.h"
|
||||
|
||||
#ifndef CROSS_TO_AMIGA
|
||||
#include "NH:sys/amiga/winami.p"
|
||||
#include "NH:sys/amiga/amiwind.p"
|
||||
#include "NH:sys/amiga/amidos.p"
|
||||
#else
|
||||
#include "winami.p"
|
||||
#include "amiwind.p"
|
||||
#include "amidos.p"
|
||||
#endif
|
||||
#include "windefs.h"
|
||||
#include "winext.h"
|
||||
#include "winproto.h"
|
||||
|
||||
/* end amigst.c */
|
||||
|
||||
@@ -1,40 +0,0 @@
|
||||
/* NetHack 3.6 amiwind.p $NHDT-Date: 1432512795 2015/05/25 00:13:15 $ $NHDT-Branch: master $:$NHDT-Revision: 1.6 $ */
|
||||
/* Copyright (c) Gregg Wonderly, Naperville, IL, 1992, 1993 */
|
||||
/* NetHack may be freely redistributed. See license for details. */
|
||||
|
||||
/* amiwind.c */
|
||||
#ifdef INTUI_NEW_LOOK
|
||||
struct Window * OpenShWindow(struct ExtNewWindow *) ;
|
||||
#else
|
||||
struct Window * OpenShWindow(struct NewWindow *) ;
|
||||
#endif
|
||||
void CloseShWindow(struct Window *);
|
||||
int kbhit (void);
|
||||
int amikbhit (void);
|
||||
int WindowGetchar (void);
|
||||
WETYPE WindowGetevent (void);
|
||||
void WindowFlush (void);
|
||||
void WindowPutchar(char );
|
||||
void WindowFPuts(const char *);
|
||||
void WindowPuts(const char *);
|
||||
void WindowPrintf( char *,... );
|
||||
void CleanUp (void);
|
||||
int ConvertKey( struct IntuiMessage * );
|
||||
#ifndef SHAREDLIB
|
||||
void Abort(long );
|
||||
#endif
|
||||
void flush_glyph_buffer(struct Window *);
|
||||
void amiga_print_glyph(winid , int , int );
|
||||
void start_glyphout(winid );
|
||||
void amii_end_glyphout(winid );
|
||||
#ifdef INTUI_NEW_LOOK
|
||||
struct ExtNewWindow * DupNewWindow(struct ExtNewWindow *);
|
||||
void FreeNewWindow(struct ExtNewWindow *);
|
||||
#else
|
||||
struct NewWindow * DupNewWindow(struct NewWindow *);
|
||||
void FreeNewWindow(struct NewWindow *);
|
||||
#endif
|
||||
void bell (void);
|
||||
void amii_delay_output (void);
|
||||
void amii_number_pad(int );
|
||||
void amii_cleanup( void );
|
||||
@@ -1,57 +0,0 @@
|
||||
/* NetHack 3.6 winami.p $NHDT-Date: 1433806595 2015/06/08 23:36:35 $ $NHDT-Branch: master $:$NHDT-Revision: 1.7 $ */
|
||||
/* Copyright (c) Gregg Wonderly, Naperville, IL, 1992, 1993 */
|
||||
/* NetHack may be freely redistributed. See license for details. */
|
||||
/* winami.c */
|
||||
void amii_raw_print(const char *);
|
||||
void amii_raw_print_bold(const char *);
|
||||
void amii_start_menu(winid , unsigned long );
|
||||
void amii_add_menu(winid, const glyph_info *, const anything *, char, char, int, int, const char *, unsigned int);
|
||||
void amii_end_menu(winid, const char *);
|
||||
int amii_select_menu(winid, int, menu_item **);
|
||||
void amii_update_inventory(int);
|
||||
void amii_mark_synch (void);
|
||||
void amii_wait_synch (void);
|
||||
void amii_setclipped (void);
|
||||
void amii_cliparound(int , int );
|
||||
void amii_askname (void);
|
||||
void amii_player_selection (void);
|
||||
void flush_output (void);
|
||||
void amii_destroy_nhwindow(winid );
|
||||
int amii_create_nhwindow(int );
|
||||
void amii_init_nhwindows (void);
|
||||
int amii_get_ext_cmd(void);
|
||||
char amii_yn_function(const char * , const char * , char );
|
||||
void amii_addtopl(const char *);
|
||||
void TextSpaces(struct RastPort * , int );
|
||||
void amii_putstr(winid , int , const char *);
|
||||
void amii_putsym(winid , int , int , CHAR_P );
|
||||
void amii_clear_nhwindow(winid );
|
||||
void amii_exit_nhwindows(const char *);
|
||||
int amii_nh_poskey(coordxy *, coordxy *, int *);
|
||||
int amii_nhgetch (void);
|
||||
void amii_get_nh_event (void);
|
||||
void amii_remember_topl (void);
|
||||
int amii_doprev_message (void);
|
||||
void amii_display_nhwindow(winid , boolean );
|
||||
void amii_display_file(const char * , boolean );
|
||||
void amii_curs(winid , int , int );
|
||||
void amii_print_glyph(winid, coordxy, coordxy, const glyph_info *, const glyph_info *);
|
||||
void DoMenuScroll(int , int );
|
||||
void DisplayData(int , int , int );
|
||||
void SetPropInfo(struct Window * , struct Gadget * , long , long , long );
|
||||
void kill_nhwindows(int );
|
||||
void amii_cl_end(struct amii_WinDesc * , int );
|
||||
void cursor_off(winid );
|
||||
void cursor_on(winid );
|
||||
void amii_getret (void);
|
||||
void amii_getlin(const char * , char *);
|
||||
void getlind(const char * , char * , const char *);
|
||||
void amii_suspend_nhwindows(const char *);
|
||||
void amii_resume_nhwindows(void);
|
||||
void amii_bell(void);
|
||||
void EditColor(void);
|
||||
void DrawCol( struct Window *, int, UWORD * ) ;
|
||||
void DispCol( struct Window *w, int idx, UWORD * ) ;
|
||||
void SetBorder(struct Gadget *) ;
|
||||
void port_help (void);
|
||||
void dismiss_nhwindow(winid) ;
|
||||
Reference in New Issue
Block a user