From: Francesco Chemolli Date: Sat, 29 Jun 2019 16:01:32 +0000 (+0000) Subject: Fix macro name clash on freebsd (#426) X-Git-Tag: SQUID_4_8~2 X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=e84077c537e196b298a9767702ea6f41a549faa8;p=thirdparty%2Fsquid.git Fix macro name clash on freebsd (#426) FreeBSD defines FD_NONE in /usr/include/fcntl.h to be magic to the system. We are not using that name explicitly anywhere, but it may make sense to keep it around as a default value for fd_type. Rename the symbol to avoid the clash and fix the build on FreeBSD. --- diff --git a/src/enums.h b/src/enums.h index daf626d982..bfcac113a6 100644 --- a/src/enums.h +++ b/src/enums.h @@ -10,7 +10,7 @@ #define SQUID_ENUMS_H enum fd_type { - FD_NONE, + FD_NONE_TYPE, FD_LOG, FD_FILE, FD_SOCKET,