From: Joseph Sutton <josephsutton@catalyst.net.nz>
Date: Thu, 9 Nov 2023 03:02:32 +0000 (+1300)
Subject: s3:include: Fix code spelling
X-Git-Tag: talloc-2.4.2~392
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f27ab6d9f5d5d9134160230c61512810fb91d495;p=thirdparty%2Fsamba.git

s3:include: Fix code spelling

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
---

diff --git a/source3/include/includes.h b/source3/include/includes.h
index 548fba24c3f..37d712084e4 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -32,7 +32,7 @@
 
 /* only do the C++ reserved word check when we compile
    to include --with-developer since too many systems
-   still have comflicts with their header files (e.g. IRIX 6.4) */
+   still have conflicts with their header files (e.g. IRIX 6.4) */
 
 #if !defined(__cplusplus) && defined(DEVELOPER) && defined(__linux__)
 #define class #error DONT_USE_CPLUSPLUS_RESERVED_NAMES