ncurses 5.9 - patch 20130831

[ncurses.git] / ncurses / tinfo / db_iterator.c

diff --git a/ncurses/tinfo/db_iterator.c b/ncurses/tinfo/db_iterator.c
index 67467d4251a99552ce9b8889117361d44318826d..b4f5f1239ea665b1b0a49b99575d1e9f4f364627 100644 (file)
--- a/ncurses/tinfo/db_iterator.c
+++ b/ncurses/tinfo/db_iterator.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 2006-2011,2012 Free Software Foundation, Inc.              *
+ * Copyright (c) 2006-2012,2013 Free Software Foundation, Inc.              *

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


@@ -43,7 +43,7 @@
 #include <hashed_db.h>
 #endif
 
 #include <hashed_db.h>
 #endif
 

-MODULE_ID("$Id: db_iterator.c,v 1.34 2012/06/30 16:30:10 tom Exp $")
+MODULE_ID("$Id: db_iterator.c,v 1.36 2013/05/25 20:20:08 tom Exp $")

 
 #define HaveTicDirectory _nc_globals.have_tic_directory
 #define KeepTicDirectory _nc_globals.keep_tic_directory
 
 #define HaveTicDirectory _nc_globals.have_tic_directory
 #define KeepTicDirectory _nc_globals.keep_tic_directory


@@ -272,7 +272,7 @@ _nc_first_db(DBDIRS * state, int *offset)
         */
        values[dbdTIC] = TicDirectory;
 
         */
        values[dbdTIC] = TicDirectory;
 

-#if USE_DATABASE
+#if NCURSES_USE_DATABASE

 #ifdef TERMINFO_DIRS
        values[dbdCfgList] = TERMINFO_DIRS;
 #endif
 #ifdef TERMINFO_DIRS
        values[dbdCfgList] = TERMINFO_DIRS;
 #endif


@@ -281,19 +281,19 @@ _nc_first_db(DBDIRS * state, int *offset)
 #endif
 #endif
 
 #endif
 #endif
 

-#if USE_TERMCAP
+#if NCURSES_USE_TERMCAP

        values[dbdCfgList2] = TERMPATH;
 #endif
 
        if (use_terminfo_vars()) {
        values[dbdCfgList2] = TERMPATH;
 #endif
 
        if (use_terminfo_vars()) {

-#if USE_DATABASE
+#if NCURSES_USE_DATABASE

            values[dbdEnvOnce] = cache_getenv("TERMINFO", dbdEnvOnce);
            values[dbdHome] = _nc_home_terminfo();
            (void) cache_getenv("HOME", dbdHome);
            values[dbdEnvList] = cache_getenv("TERMINFO_DIRS", dbdEnvList);
 
 #endif
            values[dbdEnvOnce] = cache_getenv("TERMINFO", dbdEnvOnce);
            values[dbdHome] = _nc_home_terminfo();
            (void) cache_getenv("HOME", dbdHome);
            values[dbdEnvList] = cache_getenv("TERMINFO_DIRS", dbdEnvList);
 
 #endif

-#if USE_TERMCAP
+#if NCURSES_USE_TERMCAP

            values[dbdEnvOnce2] = cache_getenv("TERMCAP", dbdEnvOnce2);
            /* only use $TERMCAP if it is an absolute path */
            if (values[dbdEnvOnce2] != 0
            values[dbdEnvOnce2] = cache_getenv("TERMCAP", dbdEnvOnce2);
            /* only use $TERMCAP if it is an absolute path */
            if (values[dbdEnvOnce2] != 0


@@ -301,7 +301,7 @@ _nc_first_db(DBDIRS * state, int *offset)
                values[dbdEnvOnce2] = 0;
            }
            values[dbdEnvList2] = cache_getenv("TERMPATH", dbdEnvList2);
                values[dbdEnvOnce2] = 0;
            }
            values[dbdEnvList2] = cache_getenv("TERMPATH", dbdEnvList2);

-#endif /* USE_TERMCAP */
+#endif /* NCURSES_USE_TERMCAP */

        }
 
        for (j = 0; j < dbdLAST; ++j) {
        }
 
        for (j = 0; j < dbdLAST; ++j) {