ncurses 6.1 - patch 20180825

[ncurses.git] / test / linedata.h

diff --git a/test/linedata.h b/test/linedata.h
index 2510ee72f646ece49d43941b9b85710c3c35cb32..b97f1c97bdd57a2d574df3dd9bdfc9059fe28187 100644 (file)
--- a/test/linedata.h
+++ b/test/linedata.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 2009,2010 Free Software Foundation, Inc.                   *
+ * Copyright (c) 2009-2012,2018 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            *
@@ -26,6 +26,16 @@
  * authorization.                                                           *
  ****************************************************************************/
 
+/*
+ * $Id: linedata.h,v 1.7 2018/02/03 22:51:43 tom Exp $
+ *
+ * Utility functions for reading a line of text from a file.
+ */
+#ifndef LINEDATA_H_incl
+#define LINEDATA_H_incl 1
+
+#include <test.priv.h>
+
 #define isQUIT(c)     ((c) == QUIT || (c) == ESCAPE)
 
 #define key_RECUR     CTRL('W')
@@ -85,10 +95,8 @@ read_linedata(WINDOW *work)
                    beep();
                    continue;
                }
-           } else if (code != ERR) {
-               result = (int) ch;
-               break;
            } else {
+               result = (int) ch;
                break;
            }
        }
@@ -98,3 +106,5 @@ read_linedata(WINDOW *work)
     }
     return result;
 }
+
+#endif /* LINEDATA_H_incl */