ncurses 6.0 - patch 20170401

[ncurses.git] / ncurses / fifo_defs.h

diff --git a/ncurses/fifo_defs.h b/ncurses/fifo_defs.h
index fa9ae226463500122d51125a50f46a370dc85fc9..d0e21fafe871dcabdf738af30d624102beeb43e8 100644 (file)
--- a/ncurses/fifo_defs.h
+++ b/ncurses/fifo_defs.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2002,2008 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2012,2016 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            *
@@ -34,7 +34,7 @@
 /*
  * Common macros for lib_getch.c, lib_ungetch.c
  *
- * $Id: fifo_defs.h,v 1.6 2008/06/28 15:52:32 tom Exp $
+ * $Id: fifo_defs.h,v 1.8 2016/09/10 21:59:25 tom Exp $
  */
 
 #ifndef FIFO_DEFS_H
@@ -45,15 +45,41 @@
 /* peek points to next uninterpreted character */
 #define peek   sp->_fifopeek
 
-#define h_inc() { head == FIFO_SIZE-1 ? head = 0 : head++; if (head == tail) head = -1, tail = 0;}
-#define h_dec() { head == 0 ? head = FIFO_SIZE-1 : head--; if (head == tail) tail = -1;}
-#define t_inc() { tail == FIFO_SIZE-1 ? tail = 0 : tail++; if (tail == head) tail = -1;}
-#define t_dec() { tail == 0 ? tail = FIFO_SIZE-1 : tail--; if (head == tail) fifo_clear(sp);}
-#define p_inc() { peek == FIFO_SIZE-1 ? peek = 0 : peek++;}
+#define h_inc() { \
+           (head >= FIFO_SIZE-1) \
+               ? head = 0 \
+               : head++; \
+           if (head == tail) \
+               head = -1, tail = 0; \
+       }
+#define h_dec() { \
+           (head <= 0) \
+               ? head = FIFO_SIZE-1 \
+               : head--; \
+           if (head == tail) \
+               tail = -1; \
+       }
+#define t_inc() { \
+           (tail >= FIFO_SIZE-1) \
+               ? tail = 0 \
+               : tail++; \
+           if (tail == head) \
+               tail = -1; \
+           }
+#define t_dec() { \
+           (tail <= 0) \
+               ? tail = FIFO_SIZE-1 \
+               : tail--; \
+           if (head == tail) \
+               fifo_clear(sp); \
+           }
+#define p_inc() { \
+           (peek >= FIFO_SIZE-1) \
+               ? peek = 0 \
+               : peek++; \
+           }
 
-#define cooked_key_in_fifo()   ((head != -1) && (peek != head))
-#define raw_key_in_fifo()      ((head != -1) && (peek != tail))
-
-#undef HIDE_EINTR
+#define cooked_key_in_fifo()   ((head >= 0) && (peek != head))
+#define raw_key_in_fifo()      ((head >= 0) && (peek != tail))
 
 #endif /* FIFO_DEFS_H */