[Libsysio-commit] HEAD: libsysio/src fcntl.c

[Lee W. <lw...@us...>]

Update of /cvsroot/libsysio/libsysio/src
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv9720

Modified Files:
	fcntl.c 
Log Message:


Changed #if TOKEN tests to ifdef's.

Changed test for GETLK so that it is true w/o LARGEFILE64 too.


Index: fcntl.c
===================================================================
RCS file: /cvsroot/libsysio/libsysio/src/fcntl.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -w -b -B -p -r1.27 -r1.28
--- fcntl.c	30 Apr 2007 16:52:20 -0000	1.27
+++ fcntl.c	1 May 2007 15:57:36 -0000	1.28
@@ -194,14 +194,14 @@ _sysio_vfcntl(int fd, int cmd, va_list a
 			}
 		}
 		break;
-#if !(_LARGEFILE64_SOURCE || F_GETLK64 == F_GETLK)
+#if !(defined(_LARGEFILE64_SOURCE) && F_GETLK64 == F_GETLK)
 	    case F_GETLK:
 	    case F_SETLK:
 	    case F_SETLKW:
 		{
 			struct intnl_stat buf;
 			struct flock *fl;
-#if _LARGEFILE64_SOURCE
+#ifdef _LARGEFILE64_SOURCE
 			struct _SYSIO_FLOCK flock64;
 #endif
 
@@ -218,7 +218,7 @@ _sysio_vfcntl(int fd, int cmd, va_list a
 			 * Copy args to a temp and normalize.
 			 */
 			fl = va_arg(ap, struct flock *);
-#if _LARGEFILE64_SOURCE
+#ifdef _LARGEFILE64_SOURCE
 			flock64.l_type = fl->l_type;
 			flock64.l_whence = fl->l_whence;
 			flock64.l_start = fl->l_start;
@@ -232,7 +232,7 @@ _sysio_vfcntl(int fd, int cmd, va_list a
 				rtn = -1;
 				break;
 			}
-#if _LARGEFILE64_SOURCE
+#ifdef _LARGEFILE64_SOURCE
 			/*
 			 * Copy back. Note that the fcntl_lock call
 			 * should have ensured that no overflow was possible.
@@ -248,8 +248,8 @@ _sysio_vfcntl(int fd, int cmd, va_list a
 			rtn = 0;
 		}
 		break;
-#endif /* !(_LARGEFILE64_SOURCE || F_GETLK64 == F_GETLK) */
-#if _LARGEFILE64_SOURCE
+#endif /* !(_LARGEFILE64_SOURCE && F_GETLK64 == F_GETLK) */
+#ifdef _LARGEFILE64_SOURCE
 	    case F_GETLK64:
 	    case F_SETLK64:
 	    case F_SETLKW64: