svn commit: samba r18418 - in branches/SAMBA_4_0/source/lib/replace/repdir: .

metze at samba.org metze at samba.org
Tue Sep 12 07:04:13 GMT 2006


Author: metze
Date: 2006-09-12 07:04:12 +0000 (Tue, 12 Sep 2006)
New Revision: 18418

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=18418

Log:
Tru64 has a different prototype for seekdir() returning int
when _OSF_SOURCE is defined

metze
Modified:
   branches/SAMBA_4_0/source/lib/replace/repdir/repdir.c


Changeset:
Modified: branches/SAMBA_4_0/source/lib/replace/repdir/repdir.c
===================================================================
--- branches/SAMBA_4_0/source/lib/replace/repdir/repdir.c	2006-09-12 06:19:11 UTC (rev 18417)
+++ branches/SAMBA_4_0/source/lib/replace/repdir/repdir.c	2006-09-12 07:04:12 UTC (rev 18418)
@@ -118,7 +118,11 @@
 	return d->seekpos + d->ofs;
 }
 
+#ifdef _OSF_SOURCE
+int seekdir(DIR *dir, long ofs)
+#else
 void seekdir(DIR *dir, long ofs)
+#endif
 {
 	struct dir_buf *d = (struct dir_buf *)dir;
 	d->seekpos = lseek(d->fd, ofs & ~(DIR_BUF_SIZE-1), SEEK_SET);
@@ -127,6 +131,9 @@
 	while (d->ofs < (ofs & (DIR_BUF_SIZE-1))) {
 		if (readdir(dir) == NULL) break;
 	}
+#ifdef _OSF_SOURCE
+	return -1;
+#else
 }
 
 void rewinddir(DIR *dir)



More information about the samba-cvs mailing list