ncurses 5.6 - patch 20081012

[ncurses.git] / include / tic.h

diff --git a/include/tic.h b/include/tic.h
index 94b224eea653a84abd0b29d90032e7609dd08ed2..4e10399356c1526081fc34e3f5b04e7466c6c8ba 100644 (file)
--- a/include/tic.h
+++ b/include/tic.h
@@ -33,7 +33,7 @@
  ****************************************************************************/
 
 /*
- * $Id: tic.h,v 1.57 2007/01/06 23:17:38 tom Exp $
+ * $Id: tic.h,v 1.62 2007/08/11 16:12:43 tom Exp $
  *     tic.h - Global variables and structures for the terminfo
  *                     compiler.
  */
@@ -163,16 +163,6 @@ struct token
 
 extern NCURSES_EXPORT_VAR(struct token)        _nc_curr_token;
 
-       /*
-        * List of keynames with their corresponding code.
-        */
-struct kn {
-       int offset;
-       int code;
-};
-
-extern NCURSES_EXPORT_VAR(const struct kn) _nc_key_names[];
-
        /*
         * Offsets to string capabilities, with the corresponding functionkey
         * codes.
@@ -185,7 +175,7 @@ struct tinfo_fkeys {
 #if    BROKEN_LINKER
 
 #define        _nc_tinfo_fkeys _nc_tinfo_fkeysf()
-extern NCURSES_EXPORT(struct tinfo_fkeys *) _nc_tinfo_fkeysf (void);
+extern NCURSES_EXPORT(const struct tinfo_fkeys *) _nc_tinfo_fkeysf (void);
 
 #else
 
@@ -214,14 +204,9 @@ struct alias
        const char      *source;
 };
 
-extern NCURSES_EXPORT_VAR(const struct name_table_entry * const) _nc_info_hash_table[];
-extern NCURSES_EXPORT_VAR(const struct name_table_entry * const) _nc_cap_hash_table[];
-
-extern NCURSES_EXPORT_VAR(const struct alias) _nc_capalias_table[];
-extern NCURSES_EXPORT_VAR(const struct alias) _nc_infoalias_table[];
-
 extern NCURSES_EXPORT(const struct name_table_entry *) _nc_get_table (bool);
-extern NCURSES_EXPORT(const struct name_table_entry * const *) _nc_get_hash_table (bool);
+extern NCURSES_EXPORT(const short *) _nc_get_hash_table (bool);
+extern NCURSES_EXPORT(const struct alias *) _nc_get_alias_table (bool);
 
 #define NOTFOUND       ((struct name_table_entry *) 0)
 
@@ -259,7 +244,7 @@ extern NCURSES_EXPORT(char *) _nc_rootname (char *);
 
 /* comp_hash.c: name lookup */
 extern NCURSES_EXPORT(struct name_table_entry const *) _nc_find_entry
-       (const char *, const struct name_table_entry *const *);
+       (const char *, const short *);
 extern NCURSES_EXPORT(struct name_table_entry const *) _nc_find_type_entry
        (const char *, int, const struct name_table_entry *);