Merge branch 'master' into hdr_fixes

Author: MajorPainTheCactus

core_info.c

@@ -2118,7 +2118,7 @@ static core_info_list_t *core_info_list_new(const char *path,
       info->core_file_id.str  = strdup(core_file_id);
       info->core_file_id.hash = core_info_hash_string(core_file_id);
 
-      strlcpy(core_file_id + _len, ".info", sizeof(core_file_id) - _len);
+      strlcpy(core_file_id + _len, FILE_PATH_CORE_INFO_EXTENSION, sizeof(core_file_id) - _len);
 
       /* Parse core info file */
       if ((conf = core_info_get_config_file(core_file_id, info_dir)))

deps/libsmb2/include/libsmb2-private.h

@@ -34,7 +34,9 @@ extern "C" {
 #endif /* __APPLE__ */
 #endif /* HAVE_LIBKRB5 */
 
+#ifndef MIN
 #define MIN(a,b) (((a)<(b))?(a):(b))
+#endif
 
 #ifndef discard_const
 #define discard_const(ptr) ((void *)((intptr_t)(ptr)))

deps/libsmb2/include/smb2/libsmb2.h

@@ -124,8 +124,11 @@ struct smb2dirent {
 #if defined(_WINDOWS) || defined(_XBOX)
 typedef SOCKET t_socket;
 #else
+#ifndef T_SOCKET_DEFINED
+#define T_SOCKET_DEFINED
 typedef int t_socket;
 #endif
+#endif
 
 /*
  * Create an SMB2 context.