From: Ruediger Pluem <rpluem@apache.org>
Date: Sat, 29 Mar 2008 22:29:39 +0000 (+0000)
Subject: * Prevent multiple "execution" of ap_expr.h contents when included multiple
X-Git-Tag: 2.3.0~841
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a792c6a39649795c92915ce036fb0253a0a06fa2;p=thirdparty%2Fapache%2Fhttpd.git

* Prevent multiple "execution" of ap_expr.h contents when included multiple
  times and allow it to be included by C++ files.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@642630 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/include/ap_expr.h b/include/ap_expr.h
index bb26d2ac780..6812bb7b846 100644
--- a/include/ap_expr.h
+++ b/include/ap_expr.h
@@ -14,8 +14,15 @@
  * limitations under the License.
  */
 
+#ifndef AP_EXPR_H
+#define AP_EXPR_H
+
 #include "httpd.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* conditional expression parser stuff */
 typedef enum {
     TOKEN_STRING,
@@ -101,3 +108,9 @@ AP_DECLARE(int) ap_expr_evalstring(request_rec *r, const char *expr,
                                    int *was_error, backref_t **reptr,
                                    string_func_t string_func,
                                    opt_func_t eval_func);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* AP_EXPR_H */