From 2465ac46256220aefa49cc95a817984102aeaed7 Mon Sep 17 00:00:00 2001 From: Rob Swindell <rob@synchro.net> Date: Thu, 10 Mar 2022 00:15:53 -0800 Subject: [PATCH] Fix FreeBSD/Clang C++ error /usr/include/c++/v1/iterator:1168:87: error: expected unqualified-id ...&& traits_type::eq_int_type(__sbuf_->sputc(__c), traits_type::eof())) ^ /src/sbbs3/../xpdev/filewrap.h:124:21: note: expanded from macro 'eof' #define eof(fd) (tell(fd)==filelength(fd)) --- src/xpdev/filewrap.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/xpdev/filewrap.h b/src/xpdev/filewrap.h index 3aa5f2b757..dba8080831 100644 --- a/src/xpdev/filewrap.h +++ b/src/xpdev/filewrap.h @@ -121,7 +121,9 @@ #define chsize(fd,size) ftruncate(fd,size) #define tell(fd) lseek(fd,0,SEEK_CUR) - #define eof(fd) (tell(fd)==filelength(fd)) + #ifndef __cplusplus // Conflict with FreeBSD /usr/include/c++/v1/iterator + #define eof(fd) (tell(fd)==filelength(fd)) + #endif #elif defined(__OS2__) -- GitLab