X_OK redefinition protection.

Earnie Boyd earnie_boyd@yahoo.com
Thu Apr 19 08:02:00 GMT 2001


I've also sent the sys-unistd file to newlib.

Earnie.
2001-04-19  Earnie Boyd  <earnie@users.sourceforge.net>

	* include/sys/file.h (X_OK): Remove redefinition warnings when 
	including both sys/unistd.h and sys/file.h.  Make the definition
	consistent with sys/unistd.h.

Index: file.h
===================================================================
RCS file: /cvs/src/src/winsup/cygwin/include/sys/file.h,v
retrieving revision 1.3
diff -u -p -r1.3 file.h
--- file.h	2001/04/18 21:10:15	1.3
+++ file.h	2001/04/19 14:50:56
@@ -23,16 +23,16 @@
 #define L_XTND 2
 
 
+#ifndef F_OK
 #define	F_OK		0	/* does file exist */
-#define	_X_OK		1	/* is it executable by caller */
-#if defined (__CYGWIN__) || defined (__INSIDE_CYGWIN__)
-# define X_OK	_X_OK	/* Check for execute permission. */
-#else
+#define	X_OK		1	/* is it executable by caller */
+#if defined (__CYGWIN__) && !defined (__INSIDE_CYGWIN__)
 # undef X_OK
 extern const unsigned _cygwin_X_OK;
 # define X_OK	_cygwin_X_OK
 #endif
 #define	W_OK		2	/* is it writable by caller */
 #define	R_OK		4	/* is it readable by caller */
+#endif /* ndef F_OK */
 
 #endif


More information about the Cygwin-patches mailing list