gui: Rename client_cmd_cmdline() to para_cmd().

[paraslash.git] / gcc-compat.h

diff --git a/gcc-compat.h b/gcc-compat.h
index a3b20d3964d0b39ab4693b20b2d80514001f6220..5d207288359f5b9151c6ca55ab54d00b4669b533 100644 (file)
--- a/gcc-compat.h
+++ b/gcc-compat.h
@@ -1,43 +1,30 @@
-#if __GNUC__ >= 3
-# define inline                inline __attribute__ ((always_inline))
-# define __pure                __attribute__ ((pure))
-# define __noreturn    __attribute__ ((noreturn))
-# define __malloc      __attribute__ ((malloc))
-# define __used                __attribute__ ((used))
-# define __unused      __attribute__ ((unused))
-# define __packed      __attribute__ ((packed))
-# define likely(x)     __builtin_expect (!!(x), 1)
-# define unlikely(x)   __builtin_expect (!!(x), 0)
-/* 
- * p is the number of the "format string" parameter, and q is 
- * the number of the first variadic parameter 
+#define inline inline __attribute__ ((always_inline))
+#define __noreturn __attribute__ ((noreturn))
+#define __malloc __attribute__ ((malloc))
+#define __a_unused __attribute__ ((unused))
+#define __a_aligned(alignment) __attribute__((__aligned__(alignment)))
+
+/*
+ * p is the number of the "format string" parameter, and q is the number of the
+ * first variadic parameter. If q is specified as zero, the compiler only
+ * checks the format string for consistency.
  */
 # define __printf(p,q) __attribute__ ((format (printf, p, q)))
+# define __a_const __attribute__ ((const))
+
 /*
- * as direct use of __printf(p,q) confuses doxygen, here are two extra macros
- * for those values p,q that are actually used by paraslash.
+ * As direct use of __printf(p,q) confuses doxygen, here are some extra macros
+ * for those values p,q that are actually used.
  */
+#define  __printf_2_0 __printf(2,0)
 #define  __printf_1_2 __printf(1,2)
 #define  __printf_2_3 __printf(2,3)
 
-#else
-
-# define inline                /* no inline */
-# define __pure                /* no pure */
-# define __noreturn    /* no noreturn */
-# define __malloc      /* no malloc */
-# define __used                /* no used */
-# define __unused      /* no unused */
-# define __packed      /* no packed */
-# define likely(x)     (x)
-# define unlikely(x)   (x)
-# define __printf(p,q) /* no format */
-#define  __printf_1_2
-#define  __printf_2_3
-#endif
-
-# if __GNUC__ >=3 && __GNUC_MINOR__ > 3
+# if __GNUC__ > 3  || (__GNUC__ == 3 && __GNUC_MINOR__ > 3)
 # define __must_check  __attribute__ ((warn_unused_result))
 # else
 # define __must_check  /* no warn_unused_result */
 # endif
+
+#define _static_inline_ static inline
+