git: 0cae6ba39388 - stable/12 - wpa: Enclose FreeBSD specific defines

Cy Schubert cy at FreeBSD.org
Mon Sep 13 21:13:10 UTC 2021


The branch stable/12 has been updated by cy:

URL: https://cgit.FreeBSD.org/src/commit/?id=0cae6ba3938893482981e2cf3e5389e082a3ec17

commit 0cae6ba3938893482981e2cf3e5389e082a3ec17
Author:     Cy Schubert <cy at FreeBSD.org>
AuthorDate: 2021-08-26 23:28:40 +0000
Commit:     Cy Schubert <cy at FreeBSD.org>
CommitDate: 2021-09-13 21:12:03 +0000

    wpa: Enclose FreeBSD specific defines
    
    FreeBSD only defines are specific only to FreeBSD. Document them as such.
    It is our intention to push this change to w1.fi.
    
    (cherry picked from commit 213ceba977def36470df3abfe1fac47f689130c1)
---
 contrib/wpa/src/common/dhcp.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/contrib/wpa/src/common/dhcp.h b/contrib/wpa/src/common/dhcp.h
index d28445e7cbd7..ff52483b12eb 100644
--- a/contrib/wpa/src/common/dhcp.h
+++ b/contrib/wpa/src/common/dhcp.h
@@ -9,6 +9,7 @@
 #ifndef DHCP_H
 #define DHCP_H
 
+#if defined(__FreeBSD__)
 /*
  * Translate Linux to FreeBSD
  */
@@ -24,6 +25,7 @@
 #define check		ip_sum
 #define saddr		ip_src
 #define daddr		ip_dst
+#endif
 
 #include <netinet/ip.h>
 #if __FAVOR_BSD


More information about the dev-commits-src-all mailing list