ncurses 5.6 - patch 20070714

[ncurses.git] / ncurses / fifo_defs.h

diff --git a/ncurses/fifo_defs.h b/ncurses/fifo_defs.h
index f4dd7be324f5af882ace62ace931c0d592b7c1cf..67799577aeadabfe268a7ce373dfca867b882a97 100644 (file)
--- a/ncurses/fifo_defs.h
+++ b/ncurses/fifo_defs.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998 Free Software Foundation, Inc.                        *
+ * Copyright (c) 1998,2002 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.2 1998/02/11 12:13:56 tom Exp $
+ * $Id: fifo_defs.h,v 1.4 2002/03/16 20:47:50 tom Exp $
  */
 
 #ifndef FIFO_DEFS_H
@@ -46,13 +46,13 @@
 #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 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();}
+#define t_dec() { tail == 0 ? tail = FIFO_SIZE-1 : tail--; if (head == tail) fifo_clear();}
 #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)
+#define cooked_key_in_fifo()   ((head != -1) && (peek != head))
+#define raw_key_in_fifo()      ((head != -1) && (peek != tail))
 
 #undef HIDE_EINTR