upgraded Image_CopyMux to be able to output constant byte values as well as indexed...

[xonotic/darkplaces.git] / common.h

diff --git a/common.h b/common.h
index 1ba72a8af89552f751d4cfc2c79aefcb14bbadec..837b01c16463b5440b9f2625f2261be00e842937 100644 (file)
--- a/common.h
+++ b/common.h
@@ -73,7 +73,7 @@ float FloatSwap (float f);
 #define LittleLong(l) (l)
 #define BigFloat(l) FloatSwap(l)
 #define LittleFloat(l) (l)
-#elif ENDIAN_BIG
+#elif defined(ENDIAN_BIG)
 // big endian
 #define BigShort(l) (l)
 #define LittleShort(l) ShortSwap(l)
@@ -173,6 +173,7 @@ extern      struct cvar_s   registered;
 #define GAME_ZYMOTIC 9
 #define GAME_FNIGGIUM 10
 #define GAME_SETHERAL 11
+#define GAME_SOM 12
 
 extern int gamemode;
 extern char *gamename;
@@ -192,6 +193,9 @@ typedef struct stringlist_s
 } stringlist_t;
 
 int matchpattern(char *in, char *pattern, int caseinsensitive);
+stringlist_t *stringlistappend(stringlist_t *current, char *text);
+void stringlistfree(stringlist_t *current);
+stringlist_t *stringlistsort(stringlist_t *start);
 stringlist_t *listdirectory(char *path);
 void freedirectory(stringlist_t *list);
 
@@ -200,8 +204,12 @@ char *SearchInfostring(const char *infostring, const char *key);
 
 // strlcat and strlcpy, from OpenBSD
 // Most (all?) BSDs already have them
-#if !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__FreeBSD__)
+#if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || (defined(__APPLE__) && defined(__MACH__))
+# define HAVE_STRLCAT 1
+# define HAVE_STRLCPY 1
+#endif
 
+#ifndef HAVE_STRLCAT
 /*
  * Appends src to string dst of size siz (unlike strncat, siz is the
  * full size of dst, not space left).  At most siz-1 characters
@@ -210,7 +218,9 @@ char *SearchInfostring(const char *infostring, const char *key);
  * If retval >= siz, truncation occurred.
  */
 size_t strlcat(char *dst, const char *src, size_t siz);
+#endif  // #ifndef HAVE_STRLCAT
 
+#ifndef HAVE_STRLCPY
 /*
  * Copy src to string dst of size siz.  At most siz-1 characters
  * will be copied.  Always NUL terminates (unless siz == 0).
@@ -218,7 +228,7 @@ size_t strlcat(char *dst, const char *src, size_t siz);
  */
 size_t strlcpy(char *dst, const char *src, size_t siz);
 
-#endif  // #if !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__FreeBSD__)
+#endif  // #ifndef HAVE_STRLCPY
 
 #endif