CLEANUP: Refactor includes

lqdetect.c

@@ -1,14 +1,14 @@
+#include "lqdetect.h"
+
 #include <stdio.h>
-#include <stdint.h>
 #include <stdlib.h>
-#include <stdbool.h>
 #include <string.h>
 #include <pthread.h>
 #include <sys/time.h>
 #include <assert.h>
-#include <memcached/util.h>
 
-#include "lqdetect.h"
+#include "memcached/util.h"
+#include "memcached/extension_loggers.h"
 
 #define LQ_THRESHOLD_DEFAULT 4000
 #define LQ_QUERY_SIZE  (64*2+64) /* bop get (longest query) : "<longest bkey>..<longest bkey> efilter <offset> <count> delete" */
@@ -221,9 +221,9 @@ static int do_make_bkeystring(char *buffer, const bkey_range *bkrange, const efl
 }
 
 /* external functions */
-int lqdetect_init(EXTENSION_LOGGER_DESCRIPTOR *logger)
+int lqdetect_init(void *logger)
 {
-    mc_logger = logger;
+    mc_logger = (EXTENSION_LOGGER_DESCRIPTOR*)logger;
     pthread_mutex_init(&lqdetect.lock, NULL);
     lqdetect_in_use = false;
 

lqdetect.h

@@ -1,14 +1,16 @@
 #ifndef LQDETECT_H
 #define LQDETECT_H
 
-#include "memcached/extension_loggers.h"
-#include "memcached/util.h"
+#include <stdbool.h>
+#include <stdint.h>
+
+#include "memcached/types.h"
 
 #define DETECT_LONG_QUERY
 
 extern bool lqdetect_in_use;
 
-int lqdetect_init(EXTENSION_LOGGER_DESCRIPTOR *logger);
+int lqdetect_init(void *logger);
 void lqdetect_final(void);
 char *lqdetect_result_get(int *size);
 int lqdetect_start(uint32_t threshold, bool *already_started);

memcached.c

@@ -61,6 +61,7 @@
 #include <stdarg.h>
 #include <stddef.h>
 
+#include "lqdetect.h"
 
 /* Lock for global stats */
 static pthread_mutex_t stats_lock = PTHREAD_MUTEX_INITIALIZER;

memcached.h

@@ -32,7 +32,6 @@
 #include "topkeys.h"
 #include "mc_util.h"
 #include "cmdlog.h"
-#include "lqdetect.h"
 #include "engine_loader.h"
 #include "sasl_defs.h"