Move universal and packet out.

libgearman-1.0/constants.h

@@ -133,7 +133,6 @@ typedef enum
 } gearman_worker_options_t;
 
 /* Types. */
-typedef struct gearman_packet_st gearman_packet_st;
 typedef struct gearman_task_st gearman_task_st;
 typedef struct gearman_client_st gearman_client_st;
 typedef struct gearman_job_st gearman_job_st;

libgearman-1.0/core.h

@@ -39,5 +39,3 @@
 #pragma once
 
 #include <libgearman-1.0/allocator.h>
-#include <libgearman-1.0/universal.h>
-#include <libgearman-1.0/packet.h>

libgearman-1.0/include.am

@@ -28,7 +28,6 @@ nobase_include_HEADERS+= \
 			 libgearman-1.0/kill.h \
 			 libgearman-1.0/limits.h \
 			 libgearman-1.0/ostream.hpp \
-			 libgearman-1.0/packet.h \
 			 libgearman-1.0/parse.h \
 			 libgearman-1.0/priority.h \
 			 libgearman-1.0/protocol.h \
@@ -39,7 +38,6 @@ nobase_include_HEADERS+= \
 			 libgearman-1.0/string.h \
 			 libgearman-1.0/task.h \
 			 libgearman-1.0/task_attr.h \
-			 libgearman-1.0/universal.h \
 			 libgearman-1.0/util.h \
 			 libgearman-1.0/version.h \
 			 libgearman-1.0/visibility.h \

libgearman/common.h

@@ -70,6 +70,8 @@ struct gearman_result_st;
 #include <libgearman/status.hpp>
 
 #include <libgearman/protocol/submit.h>
+#include <libgearman/interface/universal.hpp>
+#include <libgearman/interface/packet.hpp>
 #include <libgearman/interface/client.hpp>
 #include <libgearman/interface/task.hpp>
 #include <libgearman/interface/worker.hpp>

libgearman/connection.hpp

@@ -39,6 +39,8 @@
 #pragma once
 
 #include <libgearman-1.0/connection.h>
+#include "libgearman/interface/packet.hpp"
+#include "libgearman/interface/universal.hpp"
 
 struct gearman_connection_st
 {

libgearman/include.am

@@ -12,6 +12,8 @@
 
 nobase_include_HEADERS+= libgearman/gearman.h
 
+noinst_HEADERS+= libgearman/interface/packet.hpp
+noinst_HEADERS+= libgearman/interface/universal.hpp
 noinst_HEADERS+= libgearman/interface/client.hpp
 noinst_HEADERS+= libgearman/interface/task.hpp
 noinst_HEADERS+= libgearman/interface/worker.hpp

libgearman/interface/client.hpp

@@ -38,6 +38,7 @@
 #pragma once
 
 #include "libgearman/actions.hpp"
+#include "libgearman/interface/universal.hpp"
 
 struct Client
 {
@@ -62,11 +63,11 @@ struct Client
   uint32_t running_tasks;
   uint32_t task_count;
   void *context;
-  gearman_connection_st *con;
+  struct gearman_connection_st *con;
   gearman_task_st *task;
   gearman_task_st *task_list;
   gearman_task_context_free_fn *task_context_free_fn;
-  struct gearman_universal_st universal;
+  gearman_universal_st universal;
   struct gearman_actions_t actions;
   gearman_job_handle_t _do_handle; // Backwards compatible
   gearman_client_st* _shell;

libgearman/interface/task.hpp

@@ -38,6 +38,7 @@
 #pragma once
 
 #include "libgearman/interface/client.hpp"
+#include "libgearman/interface/packet.hpp"
 
 #define TASK_MAGIC 134
 #define TASK_ANTI_MAGIC 157

libgearman-1.0/universal.h → libgearman/interface/universal.hpp

@@ -63,7 +63,7 @@ struct gearman_universal_st
   uint32_t sending;
   int timeout; // Used by poll()
   gearman_connection_st *con_list;
-  gearman_packet_st *packet_list;
+  struct gearman_packet_st *packet_list;
   struct pollfd *pfds;
   gearman_log_fn *log_fn;
   void *log_context;