-#ifdef O_BINARY /* This is for Cygwin, */
-#define Uopen(s,n,m) open(CCS(s),(n)|O_BINARY,m) /* where all files must */
-#else /* be opened as binary */
-#define Uopen(s,n,m) open(CCS(s),n,m) /* to avoid problems */
-#endif /* with CRLF endings. */
+#ifdef O_BINARY /* This is for Cygwin, */
+#define Uopen(s,n,m) exim_open(CCS(s),(n)|O_BINARY,m) /* where all files must */
+#define Uopen2(s,n) exim_open2(CCS(s),(n)|O_BINARY)
+#else /* be opened as binary */
+#define Uopen(s,n,m) exim_open(CCS(s),n,m) /* to avoid problems */
+#define Uopen2(s,n) exim_open2(CCS(s),n)
+#endif /* with CRLF endings. */