split bda from int10vga.h , update kitten version to latest from freedos

1 files changed, 21 insertions, 37 deletions

diff --git a/kitten.h b/kitten.h
index 0761695..3ce631d 100644
--- a/kitten.h
+++ b/kitten.h
@@ -24,57 +24,41 @@
 #define _CATGETS_H
 
 #ifdef __cplusplus
-extern "C"
-{
+extern "C" {
 #endif
 
-#ifdef NO_KITTEN
-
-#define kittengets(x,y,z) (z)
-#define kittenclose()
-#define kittenopen(a)
-
-#else
-
 /* Data types */
 
-#define nl_catd int
+#if defined(__GNUC__)
+typedef int __attribute__((used)) nl_catd;
+#else
+typedef int nl_catd;
+#endif
 
 /* Functions */
-
-#define catgets(catalog, set,message_number,message) kittengets(set,message_number,message)
+#ifdef NOCATS             /* #define NOCATS to disable completely */
+#define catgets(c,x,y,s) s
+#define catopen(x,y) 1
+#define catclose(x)
+#define _(x,y,s) s
+#else
+#define catgets(catalog,set,message_number,message) kittengets(set,message_number,message)
 #define catopen(name,flag) kittenopen(name)
 #define catclose(catalog)  kittenclose()
-
 #define _(set,message_number,message) kittengets(set,message_number,message)
+#endif
 
+const char *kittengets(int setnum, int msgnum, const char *message);
+nl_catd kittenopen(char *name);
+void    kittenclose (void);
 
-  char *kittengets (int set_number, int message_number, char *message);
-  nl_catd kittenopen (char *name);
-  void kittenclose (void);
-
-  int get_line (int file, char *buffer, int size);
-
-#ifndef _MICROC_
-#ifndef __DJGPP__
-
-  int dos_open (char *filename);
-#define open(filename,mode) dos_open(filename)
-
-  int dos_read (int file, void *ptr, unsigned count);
-#define read(file, ptr, count) dos_read(file,ptr,count)
-
-  int dos_write (int file, void *ptr, unsigned count);
-#define write(file, ptr, count) dos_write(file,ptr,count)
+int get_line (int file, char *buffer, int size);
 
-  void dos_close (int file);
-#define close(file) dos_close(file)
+int kitten_extract_response(const char *s, const char *delimiters,
+                            char *responses, int num);
 
-#endif  /*DJGPP*/
-#endif				/*Micro-C */
-#endif				/*NO_KITTEN */
 #ifdef __cplusplus
 }
 #endif
 
-#endif				/* _CATGETS_H */
+#endif /* _CATGETS_H */