From 520b5dea3bc3fa506202542785d119227b1aeaf0 Mon Sep 17 00:00:00 2001
From: phk <phk@FreeBSD.org>
Date: Tue, 24 Oct 2000 13:54:31 +0000
Subject: Add $FreeBSD$

Rename local offsetof() macro to boffsetof() to avoid clashing with
the offsetof() from <stddef.h>
---
 usr.bin/mail/def.h  | 4 +++-
 usr.bin/mail/edit.c | 4 +++-
 usr.bin/mail/fio.c  | 4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)

(limited to 'usr.bin')

diff --git a/usr.bin/mail/def.h b/usr.bin/mail/def.h
index f4f417a..c81cdd6 100644
--- a/usr.bin/mail/def.h
+++ b/usr.bin/mail/def.h
@@ -31,6 +31,8 @@
  * SUCH DAMAGE.
  *
  *	@(#)def.h	8.2 (Berkeley) 3/21/94
+ *
+ * $FreeBSD$
  */
 
 /*
@@ -94,7 +96,7 @@ struct message {
  * Given a file address, determine the block number it represents.
  */
 #define blockof(off)			((int) ((off) / 4096))
-#define offsetof(off)			((int) ((off) % 4096))
+#define boffsetof(off)			((int) ((off) % 4096))
 #define positionof(block, offset)	((off_t)(block) * 4096 + (offset))
 
 /*
diff --git a/usr.bin/mail/edit.c b/usr.bin/mail/edit.c
index 2042719..c341441 100644
--- a/usr.bin/mail/edit.c
+++ b/usr.bin/mail/edit.c
@@ -29,6 +29,8 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
+ * $FreeBSD$
  */
 
 #ifndef lint
@@ -111,7 +113,7 @@ edit1(msgvec, type)
 			(void) fseek(otf, 0L, 2);
 			size = ftell(otf);
 			mp->m_block = blockof(size);
-			mp->m_offset = offsetof(size);
+			mp->m_offset = boffsetof(size);
 			mp->m_size = fsize(fp);
 			mp->m_lines = 0;
 			mp->m_flag |= MODIFY;
diff --git a/usr.bin/mail/fio.c b/usr.bin/mail/fio.c
index 2d03a60..ee95bc6 100644
--- a/usr.bin/mail/fio.c
+++ b/usr.bin/mail/fio.c
@@ -29,6 +29,8 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
+ * $FreeBSD$
  */
 
 #ifndef lint
@@ -109,7 +111,7 @@ setptr(ibuf)
 			this.m_size = 0;
 			this.m_lines = 0;
 			this.m_block = blockof(offset);
-			this.m_offset = offsetof(offset);
+			this.m_offset = boffsetof(offset);
 			inhead = 1;
 		} else if (linebuf[0] == 0) {
 			inhead = 0;
-- 
cgit v1.1