X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=unix%2Fuxser.c;h=24b0124cb4aba9fad9735f1a3901bd8e6b8c2477;hb=90e7bf4228fa74fda1c65cb2597c9d964329f702;hp=08f2157544a3ba7e27eebfd5a570ae334a8adebd;hpb=fd6d9bd677cbb2a1a56060d118f4d56b61c82244;p=PuTTY.git

diff --git a/unix/uxser.c b/unix/uxser.c
index 08f21575..24b0124c 100644
--- a/unix/uxser.c
+++ b/unix/uxser.c
@@ -214,7 +214,16 @@ static const char *serial_configure(Serial serial, Config *cfg)
 #ifdef ONLCR
 			 | ONLCR
 #endif
-			 | OCRNL | ONOCR | ONLRET);
+#ifdef OCRNL
+			 | OCRNL
+#endif
+#ifdef ONOCR
+			 | ONOCR
+#endif
+#ifdef ONLRET
+			 | ONLRET
+#endif
+			 );
     options.c_cc[VMIN] = 1;
     options.c_cc[VTIME] = 0;
 
@@ -257,7 +266,7 @@ static const char *serial_init(void *frontend_handle, void **backend_handle,
     if (serial->fd < 0)
 	return "Unable to open serial port";
 
-    fcntl(serial->fd, F_SETFD, FD_CLOEXEC);
+    cloexec(serial->fd);
 
     err = serial_configure(serial, cfg);
     if (err)