ncurses 5.6 - patch 20081012

[ncurses.git] / include / MKterm.h.awk.in

diff --git a/include/MKterm.h.awk.in b/include/MKterm.h.awk.in
index 43f9ba7fce4e3c9ea15dac4bb6ccb903af5f981f..5fc20529b11b360cd40f6231da3ac24dba140d3c 100644 (file)
--- a/include/MKterm.h.awk.in
+++ b/include/MKterm.h.awk.in
@@ -1,7 +1,7 @@
 # vile:awkmode
 BEGIN          {
                    print  "/****************************************************************************"
 # vile:awkmode
 BEGIN          {
                    print  "/****************************************************************************"

-                   print  " * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *"
+                   print  " * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *"

                    print  " *                                                                          *"
                    print  " * Permission is hereby granted, free of charge, to any person obtaining a  *"
                    print  " * copy of this software and associated documentation files (the            *"
                    print  " *                                                                          *"
                    print  " * Permission is hereby granted, free of charge, to any person obtaining a  *"
                    print  " * copy of this software and associated documentation files (the            *"


@@ -34,7 +34,7 @@ BEGIN         {
                    print  "/*    and: Thomas E. Dickey                        1995-on                  */"
                    print  "/****************************************************************************/"
                    print  ""
                    print  "/*    and: Thomas E. Dickey                        1995-on                  */"
                    print  "/****************************************************************************/"
                    print  ""

-                   print  "/* $Id: MKterm.h.awk.in,v 1.48 2007/04/28 20:35:34 tom Exp $ */"
+                   print  "/* $Id: MKterm.h.awk.in,v 1.50 2008/05/24 23:13:59 tom Exp $ */"

                    print  ""
                    print  "/*"
                    print  "**  term.h -- Definition of struct term"
                    print  ""
                    print  "/*"
                    print  "**  term.h -- Definition of struct term"


@@ -228,31 +228,33 @@ END               {
                        print  "    char *      _termname;      /* used for termname() */"
                        print  "} TERMINAL;"
                        print  ""
                        print  "    char *      _termname;      /* used for termname() */"
                        print  "} TERMINAL;"
                        print  ""

-                       print  "extern NCURSES_EXPORT_VAR(TERMINAL *) cur_term;"
-                       print  ""
-                       print  "#if BROKEN_LINKER"
-                       print  "#define boolnames  _nc_boolnames()"
-                       print  "#define boolcodes  _nc_boolcodes()"
-                       print  "#define boolfnames _nc_boolfnames()"
-                       print  "#define numnames   _nc_numnames()"
-                       print  "#define numcodes   _nc_numcodes()"
-                       print  "#define numfnames  _nc_numfnames()"
-                       print  "#define strnames   _nc_strnames()"
-                       print  "#define strcodes   _nc_strcodes()"
-                       print  "#define strfnames  _nc_strfnames()"
+                       print  "#if @BROKEN_LINKER@ || @cf_cv_enable_reentrant@"
+                       print  "NCURSES_WRAPPED_VAR(TERMINAL *, cur_term);"
+                       print  "NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, boolnames);"
+                       print  "NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, boolcodes);"
+                       print  "NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, boolfnames);"
+                       print  "NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, numnames);"
+                       print  "NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, numcodes);"
+                       print  "NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, numfnames);"
+                       print  "NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, strnames);"
+                       print  "NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, strcodes);"
+                       print  "NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, strfnames);"

                        print  ""
                        print  ""

-                       print  "extern NCURSES_EXPORT(NCURSES_CONST char * const *) _nc_boolnames (void);"
-                       print  "extern NCURSES_EXPORT(NCURSES_CONST char * const *) _nc_boolcodes (void);"
-                       print  "extern NCURSES_EXPORT(NCURSES_CONST char * const *) _nc_boolfnames (void);"
-                       print  "extern NCURSES_EXPORT(NCURSES_CONST char * const *) _nc_numnames (void);"
-                       print  "extern NCURSES_EXPORT(NCURSES_CONST char * const *) _nc_numcodes (void);"
-                       print  "extern NCURSES_EXPORT(NCURSES_CONST char * const *) _nc_numfnames (void);"
-                       print  "extern NCURSES_EXPORT(NCURSES_CONST char * const *) _nc_strnames (void);"
-                       print  "extern NCURSES_EXPORT(NCURSES_CONST char * const *) _nc_strcodes (void);"
-                       print  "extern NCURSES_EXPORT(NCURSES_CONST char * const *) _nc_strfnames (void);"
+                       print  "#define cur_term   NCURSES_PUBLIC_VAR(cur_term())"
+                       print  "#define boolnames  NCURSES_PUBLIC_VAR(boolnames())"
+                       print  "#define boolcodes  NCURSES_PUBLIC_VAR(boolcodes())"
+                       print  "#define boolfnames NCURSES_PUBLIC_VAR(boolfnames())"
+                       print  "#define numnames   NCURSES_PUBLIC_VAR(numnames())"
+                       print  "#define numcodes   NCURSES_PUBLIC_VAR(numcodes())"
+                       print  "#define numfnames  NCURSES_PUBLIC_VAR(numfnames())"
+                       print  "#define strnames   NCURSES_PUBLIC_VAR(strnames())"
+                       print  "#define strcodes   NCURSES_PUBLIC_VAR(strcodes())"
+                       print  "#define strfnames  NCURSES_PUBLIC_VAR(strfnames())"

                        print  ""
                        print  "#else"
                        print  ""
                        print  ""
                        print  "#else"
                        print  ""

+                       print  "extern NCURSES_EXPORT_VAR(TERMINAL *) cur_term;"
+                       print  ""

                        print  "extern NCURSES_EXPORT_VAR(NCURSES_CONST char * const ) boolnames[];"
                        print  "extern NCURSES_EXPORT_VAR(NCURSES_CONST char * const ) boolcodes[];"
                        print  "extern NCURSES_EXPORT_VAR(NCURSES_CONST char * const ) boolfnames[];"
                        print  "extern NCURSES_EXPORT_VAR(NCURSES_CONST char * const ) boolnames[];"
                        print  "extern NCURSES_EXPORT_VAR(NCURSES_CONST char * const ) boolcodes[];"
                        print  "extern NCURSES_EXPORT_VAR(NCURSES_CONST char * const ) boolfnames[];"