add int64 support to toolchain, and fix errors

Add `UINT64_T_ARG` and `INT64_T_ARG` macros for printf arguments, similar to `SIZE_T_ARG` and `PTRDIFF_T_ARG`.

In the process, fix some issues with the toolchain: in certain CI runs the toolchain headers were being #included multiple times, and certain CI runs produced collisions between clang definitions and gcc definitions.  Resolve these issues with `#pragma once` and preprocessor guards in the event of both gcc and clang being active.

Also remove toolchain.h from sexp_container.cpp since it is already #included via pstypes.h.

Author: Goober5000

code/globalincs/toolchain/clang.h

@@ -16,6 +16,7 @@
  * include toolchain.h which will pull in the file appropriate to
  * the detected toolchain.
  */
+#pragma once
 
 #if defined(__clang__)
 
@@ -63,6 +64,9 @@
 #define SIZE_T_ARG    "%zu"
 #define PTRDIFF_T_ARG "%zd"
 
+#define UINT64_T_ARG  "%" PRIu64
+#define  INT64_T_ARG  "%" PRId64
+
 #define likely(x)    __builtin_expect((long) !!(x), 1L)
 #define unlikely(x)  __builtin_expect((long) !!(x), 0L)
 

code/globalincs/toolchain/doxygen.h

@@ -5,6 +5,7 @@
  * or otherwise commercially exploit the source or things you created based on
  * the source.
  */
+#pragma once
 
 #if defined(DOXYGEN)
 /**
@@ -46,6 +47,22 @@
  */
 #define PTRDIFF_T_ARG "%zd"
 
+/**
+ * @brief Format specifier for a @c uint64_t argument
+ *
+ * Due to different runtimes using different format specifier for these types
+ * it's necessary to hide these changes behind a macro.
+ */
+#define UINT64_T_ARG  "%" PRIu64
+
+/**
+ * @brief Format specifier for an @c int64_t argument
+ *
+ * Due to different runtimes using different format specifier for these types
+ * it's necessary to hide these changes behind a macro.
+ */
+#define  INT64_T_ARG  "%" PRId64
+
 /**
  * @brief Attribute for forcing a static variable to be instantiated
  *

code/globalincs/toolchain/gcc.h

@@ -16,8 +16,10 @@
  * include toolchain.h which will pull in the file appropriate to
  * the detected toolchain.
  */
+#pragma once
 
-#if defined(__GNUC__)
+// per toolchain.h, clang takes precedence over gcc if they are both defined
+#if defined(__GNUC__) && !defined(__clang__)
 
 #define SCP_FORMAT_STRING
 #define SCP_FORMAT_STRING_ARGS(x,y)  __attribute__((format(printf, x, y)))
@@ -62,6 +64,9 @@
 #define SIZE_T_ARG    "%zu"
 #define PTRDIFF_T_ARG "%zd"
 
+#define UINT64_T_ARG  "%" PRIu64
+#define  INT64_T_ARG  "%" PRId64
+
 #define likely(x)    __builtin_expect((long) !!(x), 1L)
 #define unlikely(x)  __builtin_expect((long) !!(x), 0L)
 

code/globalincs/toolchain/mingw.h

@@ -16,6 +16,7 @@
  * include toolchain.h which will pull in the file appropriate to
  * the detected toolchain.
  */
+#pragma once
 
 #if defined(__MINGW32__)
 
@@ -59,6 +60,9 @@
 #define SIZE_T_ARG    "%zu"
 #define PTRDIFF_T_ARG "%zd"
 
+#define UINT64_T_ARG  "%" PRIu64
+#define  INT64_T_ARG  "%" PRId64
+
 #define likely(x)    __builtin_expect((long) !!(x), 1L)
 #define unlikely(x)  __builtin_expect((long) !!(x), 0L)
 

code/globalincs/toolchain/msvc.h

@@ -16,6 +16,7 @@
  * include toolchain.h which will pull in the file appropriate to
  * the detected toolchain.
  */
+#pragma once
 
 #if defined(_MSC_VER)
 
@@ -60,6 +61,9 @@
 #define SIZE_T_ARG    "%Iu"
 #define PTRDIFF_T_ARG "%Id"
 
+#define UINT64_T_ARG  "%I64u"
+#define  INT64_T_ARG  "%I64d"
+
 #define likely(x) (x)
 #define unlikely(x) (x)
 

code/parse/sexp_container.cpp

@@ -10,7 +10,6 @@
 
 #include "gamesequence/gamesequence.h"
 #include "globalincs/pstypes.h"
-#include "globalincs/toolchain.h"
 #include "mission/missiongoals.h"
 #include "parse/generic_log.h"
 #include "parse/parselo.h"