httpd-apreq-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From is...@apache.org
Subject svn commit: r1633096 - /httpd/apreq/trunk/library/t/at.h
Date Mon, 20 Oct 2014 10:39:37 GMT
Author: issac
Date: Mon Oct 20 10:39:37 2014
New Revision: 1633096

URL: http://svn.apache.org/r1633096
Log:
Restore Windows (and NeXT and NetWare etc) build of test suite following revision 1124400
<stevehay>

http://marc.info/?l=apreq-dev&m=139544026707636&w=2 (patch was modified)

Modified:
    httpd/apreq/trunk/library/t/at.h

Modified: httpd/apreq/trunk/library/t/at.h
URL: http://svn.apache.org/viewvc/httpd/apreq/trunk/library/t/at.h?rev=1633096&r1=1633095&r2=1633096&view=diff
==============================================================================
--- httpd/apreq/trunk/library/t/at.h (original)
+++ httpd/apreq/trunk/library/t/at.h Mon Oct 20 10:39:37 2014
@@ -77,8 +77,17 @@ struct at_t {
 };
 
 
+#if defined(WIN32)
+#define AT_INLINE __inline
+#elif !defined(__GNUC__) || __GNUC__ < 2 || \
+    (__GNUC__ == 2 && __GNUC_MINOR__ < 7) ||\
+    defined(NEXT) || defined(NETWARE)
+#define AT_INLINE
+#else
+#define AT_INLINE __inline__
+#endif
 
-static inline
+static AT_INLINE
 int at_report(at_t *t, const char *msg) {
     at_report_t *r = t->report;
     return r->func(r, msg);
@@ -129,7 +138,7 @@ void at_end(at_t *t);
 
 int at_comment(at_t *t, const char *fmt, va_list vp);
 
-static inline
+static AT_INLINE
 void at_debug(at_t *t, const char *fmt, ...) {
     va_list vp;
     va_start(vp, fmt);
@@ -138,7 +147,7 @@ void at_debug(at_t *t, const char *fmt, 
     va_end(vp);
 }
 
-static inline
+static AT_INLINE
 void at_trace(at_t *t, const char *fmt, ...) {
     va_list vp;
     va_start(vp, fmt);
@@ -150,7 +159,7 @@ void at_trace(at_t *t, const char *fmt, 
 
 /* These are "checks". */
 
-static inline
+static AT_INLINE
 void at_check(at_t *t, int is_ok, const char *label, const char *file,
            int line, const char *fmt, ...)
 {
@@ -268,7 +277,7 @@ void at_check(at_t *t, int is_ok, const 
                                   __FILE__, __LINE__, fmt, a, b)
 
 
-static inline
+static AT_INLINE
 void at_skip(at_t *t, int n, const char *reason, const char *file, int line) {
     char buf[256];
     while (n-- > 0) {
@@ -285,7 +294,7 @@ void at_skip(at_t *t, int n, const char 
 /* Report utilities. */
 
 at_report_t *at_report_file_make(FILE *f);
-inline
+AT_INLINE
 static at_report_t *at_report_stdout_make(void)
 {
     return at_report_file_make(stdout);



Mime
View raw message