Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

now we recovery the bool macro undefined by the nginx headers for the…

… libdrizzle headers, which should fix the compilation errors on Mac OS X.
  • Loading branch information...
commit 5021a3a4a77c1294e5a519b15af043a0d4837cf6 1 parent 0b1f06e
@agentzh agentzh authored
View
12 src/ngx_http_drizzle_module.h
@@ -1,11 +1,21 @@
#ifndef NGX_HTTP_DRIZZLE_MODULE_H
#define NGX_HTTP_DRIZZLE_MODULE_H
-#include <libdrizzle/drizzle_client.h>
+
#include <ngx_config.h>
#include <nginx.h>
#include <ngx_http.h>
+/* XXX nginx undefines "bool", which breaks the libdrizzle 1.0 API
+ * which makes use of "bool" */
+#if defined(__GNUC__)
+# ifndef bool
+# define bool _Bool
+# endif
+#endif
+
+#include <libdrizzle/drizzle_client.h>
+
#ifndef NGX_HTTP_GONE
#define NGX_HTTP_GONE 410
View
1  src/ngx_http_drizzle_output.h
@@ -1,7 +1,6 @@
#ifndef NGX_HTTP_DRIZZLE_OUTPUT_H
#define NGX_HTTP_DRIZZLE_OUTPUT_H
-#include <libdrizzle/drizzle_client.h>
#include "ngx_http_drizzle_upstream.h"
ngx_int_t ngx_http_drizzle_output_result_header(ngx_http_request_t *r,
View
2  src/ngx_http_drizzle_processor.c
@@ -10,8 +10,6 @@
#include "ngx_http_drizzle_output.h"
#include "ngx_http_drizzle_upstream.h"
-#include <libdrizzle/drizzle_client.h>
-
#define MYSQL_ER_NO_SUCH_TABLE 1146
View
3  src/ngx_http_drizzle_upstream.h
@@ -2,11 +2,10 @@
#define NGX_HTTP_DRIZZLE_UPSTREAM_H
-#include "ngx_http_drizzle_module.h"
#include <ngx_core.h>
#include <ngx_http.h>
#include <nginx.h>
-#include <libdrizzle/drizzle_client.h>
+#include "ngx_http_drizzle_module.h"
typedef enum {
Please sign in to comment.
Something went wrong with that request. Please try again.