Merge pull request #11699 from richardkchapman/osx_warn

HPCC-20508 Fix some trivial build warnings

Reviewed-by: Gavin Halliday <ghalliday@hpccsystems.com>

common/remote/sockfile.cpp

@@ -622,6 +622,8 @@ static IDAFS_Exception *createDafsException(int code, const char *msg)
     return new CDafsException(code, msg);
 }
 
+static IDAFS_Exception *createDafsExceptionVA(int code, const char *format, va_list args) __attribute__((format(printf,2,0)));
+
 static IDAFS_Exception *createDafsExceptionVA(int code, const char *format, va_list args)
 {
     StringBuffer eStr;
@@ -629,6 +631,7 @@ static IDAFS_Exception *createDafsExceptionVA(int code, const char *format, va_l
     return new CDafsException(code, eStr);
 }
 
+static IDAFS_Exception *createDafsExceptionV(int code, const char *format, ...) __attribute__((format(printf,2,3)));
 static IDAFS_Exception *createDafsExceptionV(int code, const char *format, ...)
 {
     va_list args;

deployment/envgen2/EnvGen.hpp

@@ -13,7 +13,7 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 ############################################################################## */
-#ifndef _EVNGEN2_INCL
+#ifndef _ENVGEN2_INCL
 #define _ENVGEN2_INCL
 
 //#include <vector>