X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=gmqcc.h;h=94a4bf638c48441674b4eed014a5ad00a8d82150;hb=7ea1033a43e78de662feaa41fd71d791a5749936;hp=b9aca8378f44c8c29c78c3347fc04e5ebcf871be;hpb=10c7f4f838dc976470d3308c5a5910dc7cba41b0;p=xonotic%2Fgmqcc.git

diff --git a/gmqcc.h b/gmqcc.h
index b9aca83..94a4bf6 100644
--- a/gmqcc.h
+++ b/gmqcc.h
@@ -45,11 +45,28 @@
 #define GMQCC_VERSION_BUILD(J,N,P) (((J)<<16)|((N)<<8)|(P))
 #define GMQCC_VERSION \
     GMQCC_VERSION_BUILD(GMQCC_VERSION_MAJOR, GMQCC_VERSION_MINOR, GMQCC_VERSION_PATCH)
-
-#ifndef GMQCC_GITINFO
-# define GMQCC_GITINFO "(no git info)"
+/* Undefine the following on a release-tag: */
+#define GMQCC_VERSION_TYPE_DEVEL
+
+/* Full version string in case we need it */
+#ifdef GMQCC_GITINFO
+#    define GMQCC_DEV_VERSION_STRING "git build: " GMQCC_GITINFO "\n"
+#elif defined(GMQCC_VERSION_TYPE_DEVEL)
+#    define GMQCC_DEV_VERSION_STRING "development build\n"
+#else
+#    define GMQCC_DEV_VERSION_STRING
 #endif
 
+#define GMQCC_STRINGIFY(x) #x
+#define GMQCC_IND_STRING(x) GMQCC_STRINGIFY(x)
+#define GMQCC_FULL_VERSION_STRING \
+"GMQCC " \
+GMQCC_IND_STRING(GMQCC_VERSION_MAJOR) "." \
+GMQCC_IND_STRING(GMQCC_VERSION_MINOR) "." \
+GMQCC_IND_STRING(GMQCC_VERSION_PATCH) \
+" Built " __DATE__ " " __TIME__ \
+"\n" GMQCC_DEV_VERSION_STRING
+
 /*
  * We cannot rely on C99 at all, since compilers like MSVC
  * simply don't support it.  We define our own boolean type
@@ -303,17 +320,17 @@ void _util_vec_grow(void **a, size_t i, size_t s);
 
 /* exposed interface */
 #define vec_meta(A)       (((vector_t*)(A)) - 1)
-#define vec_free(A)       ((A) ? (mem_d((void*)vec_meta(A)), (A) = NULL) : 0)
+#define vec_free(A)       ((void)((A) ? (mem_d((void*)vec_meta(A)), (A) = NULL) : 0))
 #define vec_push(A,V)     (GMQCC_VEC_WILLGROW((A),1), (A)[vec_meta(A)->used++] = (V))
 #define vec_size(A)       ((A) ? vec_meta(A)->used : 0)
 #define vec_add(A,N)      (GMQCC_VEC_WILLGROW((A),(N)), vec_meta(A)->used += (N), &(A)[vec_meta(A)->used-(N)])
 #define vec_last(A)       ((A)[vec_meta(A)->used - 1])
-#define vec_pop(A)        (vec_meta(A)->used -= 1)
-#define vec_shrinkto(A,N) (vec_meta(A)->used  = (N))
-#define vec_shrinkby(A,N) (vec_meta(A)->used -= (N))
-#define vec_append(A,N,S) memcpy(vec_add((A), (N)), (S), (N) * sizeof(*(S)))
-#define vec_upload(X,Y,S) memcpy(vec_add((X), (S) * sizeof(*(Y))), (Y), (S) * sizeof(*(Y)))
-#define vec_remove(A,I,N) memmove((A)+(I),(A)+((I)+(N)),sizeof(*(A))*(vec_meta(A)->used-(I)-(N))),vec_meta(A)->used-=(N)
+#define vec_pop(A)        ((void)(vec_meta(A)->used -= 1))
+#define vec_shrinkto(A,N) ((void)(vec_meta(A)->used  = (N)))
+#define vec_shrinkby(A,N) ((void)(vec_meta(A)->used -= (N)))
+#define vec_append(A,N,S) ((void)(memcpy(vec_add((A), (N)), (S), (N) * sizeof(*(S)))))
+#define vec_upload(X,Y,S) ((void)(memcpy(vec_add((X), (S) * sizeof(*(Y))), (Y), (S) * sizeof(*(Y)))))
+#define vec_remove(A,I,N) ((void)(memmove((A)+(I),(A)+((I)+(N)),sizeof(*(A))*(vec_meta(A)->used-(I)-(N))),vec_meta(A)->used-=(N)))
 
 typedef struct trie_s {
     void          *value;
@@ -958,7 +975,7 @@ typedef struct qc_program_s {
     int    argc; /* current arg count for debugging */
 } qc_program;
 
-qc_program* prog_load(const char *filename);
+qc_program* prog_load(const char *filename, bool ignoreversion);
 void        prog_delete(qc_program *prog);
 
 bool prog_exec(qc_program *prog, prog_section_function *func, size_t flags, long maxjumps);
@@ -1131,6 +1148,8 @@ typedef struct {
     uint16_t    forced_crc;     /* --force-crc=  */
     bool        pp_only;        /* -E            */
     size_t      max_array_size; /* --max-array=  */
+    bool        add_info;       /* --add-info    */
+    bool        correction;     /* --correct     */
 
     uint32_t flags        [1 + (COUNT_FLAGS         / 32)];
     uint32_t warn         [1 + (COUNT_WARNINGS      / 32)];