From 0404e2effce30224c1a09b41da20b9750260f33c Mon Sep 17 00:00:00 2001
From: Rene Richarz <rene.richarz@bluewin.ch>
Date: Mon, 25 Jan 2021 14:39:33 +0100
Subject: [PATCH] Cygwin defines FIONREAD in <sys/socket.h>. #26

---
 tek4010      | Bin 50272 -> 50272 bytes
 tube.c       |   3 ++-
 versions.txt |   4 ++++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/tek4010 b/tek4010
index 4e655ee98cc485e10480f8ccd25bc07cba0ff66f..d9c6ddecf50dd8ab749b7660a0d076fb92f375a9 100755
GIT binary patch
delta 516
zcmXYuUnoOS9LImZU02%!ZBbH$mRdZR5@Mx2sH@P5JTE-pN%G)9QH-mk&6&`a=3i~>
zL7hG9L0QYg9#;P3VM0xLup)aAZ+x%Z`rOa&d(OGPd+t4XUCHZ;ztf`WM4HZ|1>9rm
zFv4&k_Ep(1*fcczS-xFU2v4c@QRQ}@gEGO<js@>B(;^6is4&qH9EanuKVYKB3R4nw
z3S_`F$bmd~1x4@;&hQNRm=drVPQq6B60U(WumjG*ZEy;9`FMo92-Dyk19PwrqTmjU
zFEKsBFMxt3%7(Ea_!~J6S7LKcaE`hko(2ijv!b=@ly}4v?g_cpT~VfFR#=3zce&o@
ztZq!MqCejE0*Hz|StFx&4mk&}qeoFbj~=QGR{TpRqA_%hX=4k<x4eORV@@7Vge;tt
z?wJP*yJYRW+sy59Y`LJ6I5&S5#EqzuUVWfco^3cvZN||UmqOM*dqg34!J3S1eVEZ?
ucdy5UCijsRwt4=S64_`{A@a!TgXVfZ5xwa;_3wzqWZJG8%RDlWzT#izjiL$w

delta 518
zcmXYuPbh<79LImpUhmq9vaD<eAybO{$z*Yu9Tc^L!_scV4&+2D4$8sIE0TFQh_w8v
z$<pds+F?b@fm;5Q!-Sf0uv&2tmxb@My!ClMzu)uc_x_&u$!bbgQ`Q_tw?^dF7`a2P
zQPqpY8#?+nUoW$tQj6{CV8S(N=sneo;McT>vq<NhFTf}O!XUzR6oI2~3|<TAC>&&z
zM0^3#;2u1ISC9vvpa5dnQ?kG)4wu3S*bHC5HSi_e1gBvKd=B?4utD-6@q;7=X5keO
z1sUL*XOxBC0Bz_fy@Q6}0`e$qL34K5AmRbo58{Ytcw5&o+u_f6C&W^BMHvtG<z?94
zZmmx);u!eaD<JxC-pU-6GsrXW3Mzbxmyvz7){H;dic}8WVp=vJPm%{V%-O}^*tU@+
zg=^~3$a+N8tjnNwG<S}W7z*T+lBV_FIey10#jw_|7qQg_y-8k<d=x4#+QV}jXUr{*
zHs1{>w6*Khq0mFPg_%76ONmT0t`K>Ib+568o$%gNwOYJnKAx&m<uZ>5rEb_CW5=Xw

diff --git a/tube.c b/tube.c
index 06cca46..3230379 100755
--- a/tube.c
+++ b/tube.c
@@ -48,6 +48,7 @@
 #include <sys/time.h>
 #include <locale.h>
 #include <pwd.h>
+// Cygwin defines FIONREAD in <sys/socket.h>. #26
 #ifndef FIONREAD
 #include <sys/socket.h>
 #endif
@@ -287,7 +288,7 @@ void tube_init(int argc, char* argv[])
         char *argv2[20];
         size_t bufsize = 127;
         int firstArg = 1;
-        printf("tek4010 version 1.5.7b\n");
+        printf("tek4010 version 1.6\n");
         windowName = "Tektronix 4010/4014 emulator";
         if ((argc<2) || (argc>19)) {
                 printf("Error:number of arguments\n");
diff --git a/versions.txt b/versions.txt
index e6c5358..031491f 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,3 +1,7 @@
+Version 1.6 of January 25, 2021
+===============================
+- Cygwin defines FIONREAD in <sys/socket.h>.
+
 Version 1.5.7b of January 27, 2020
 ==================================
 - ESC FF clears the screen, FF alone does not, as in the original hardware