misc: move structures away from pp_resource.h

src/async_network.c

@@ -25,6 +25,8 @@
 #include "async_network.h"
 #include <glib.h>
 #include <stdio.h>
+#include <string.h>
+#include <unistd.h>
 #include <pthread.h>
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -42,7 +44,9 @@
 #include "trace.h"
 #include "config.h"
 #include "ppb_message_loop.h"
-
+#include "ppb_tcp_socket.h"
+#include "ppb_udp_socket.h"
+#include "ppb_host_resolver.h"
 
 static struct event_base *event_b = NULL;
 static struct evdns_base *evdns_b = NULL;

src/font.c

@@ -28,6 +28,8 @@
 #include <ppapi/c/pp_errors.h>
 #include "ppb_var.h"
 #include "trace.h"
+#include "ppb_image_data.h"
+#include <pango/pangocairo.h>
 
 
 struct PP_Var

src/glx.h

@@ -0,0 +1,5 @@
+#pragma once
+
+#define GLX_GLXEXT_LEGACY  // prevent inclusion of glxext.h
+
+#include <GL/glx.h>

src/main_thread.c

@@ -24,9 +24,11 @@
 
 #include "main_thread.h"
 #include "ppb_message_loop.h"
+#include "ppb_instance.h"
 #include "pp_resource.h"
 #include <pthread.h>
 #include "trace.h"
+#include "utils.h"
 
 
 static

src/n2p_proxy_class.c

@@ -36,6 +36,7 @@
 #include "ppb_var.h"
 #include "ppb_message_loop.h"
 #include <ppapi/c/pp_errors.h>
+#include "utils.h"
 
 
 struct has_property_param_s {

src/np_entry.c

@@ -43,6 +43,9 @@
 #include "ppb_core.h"
 #include "gtk_wrapper.h"
 #include "np_asynccall.h"
+#include "ppb_instance.h"
+#include <unistd.h>
+#include "utils.h"
 
 
 static void *module_dl_handler;

src/np_functions.c

@@ -52,14 +52,21 @@
 #include "ppb_var.h"
 #include "ppb_core.h"
 #include "ppb_cursor_control.h"
+#include "ppb_instance.h"
+#include "ppb_graphics2d.h"
+#include "ppb_graphics3d.h"
 #include "ppb_message_loop.h"
 #include "ppb_flash_fullscreen.h"
 #include "ppb_url_util.h"
+#include "ppb_view.h"
 #include "header_parser.h"
 #include "keycodeconvert.h"
 #include "eintr_retry.h"
 #include "compat.h"
+#include "utils.h"
 #include "x11_event_thread.h"
+#include <pango/pangocairo.h>
+#include <unistd.h>
 
 
 int16_t

src/p2n_proxy_class.c

@@ -37,6 +37,7 @@
 #include "ppb_core.h"
 #include "ppb_message_loop.h"
 #include "n2p_proxy_class.h"
+#include "utils.h"
 
 
 NPObject *

src/p2n_proxy_class.h

@@ -26,6 +26,11 @@
 
 #include <npapi/npapi.h>
 #include <npapi/npruntime.h>
+#include <ppapi/c/pp_var.h>
 
+struct np_proxy_object_s {
+    NPObject npobj;
+    struct PP_Var ppobj;
+};
 
 extern struct NPClass p2n_proxy_class;

src/pp_resource.c

@@ -37,6 +37,10 @@ static GHashTable      *destructors_ht = NULL;
 static int              res_tbl_next = 0;
 static pthread_mutex_t  res_tbl_lock = PTHREAD_MUTEX_INITIALIZER;
 
+struct pp_resource_generic_s {
+    COMMON_STRUCTURE_FIELDS
+};
+
 static
 __attribute__((constructor))
 void
@@ -51,7 +55,7 @@ constructor_pp_resource(void)
 PP_Resource
 pp_resource_allocate(enum pp_resource_type_e type, struct pp_instance_s *instance)
 {
-    struct pp_resource_generic_s *res = g_slice_alloc0(sizeof(union pp_largest_u));
+    struct pp_resource_generic_s *res = g_slice_alloc0(LARGEST_RESOURCE_SIZE);
     res->resource_type = type;
     res->ref_cnt = 1;
     pthread_mutex_init(&res->lock, NULL);
@@ -71,7 +75,7 @@ pp_resource_expunge(PP_Resource resource)
     pthread_mutex_lock(&res_tbl_lock);
     void *ptr = g_hash_table_lookup(res_tbl, GINT_TO_POINTER(resource));
     if (ptr) {
-        g_slice_free(union pp_largest_u, ptr);
+        g_slice_free1(LARGEST_RESOURCE_SIZE, ptr);
         g_hash_table_remove(res_tbl, GINT_TO_POINTER(resource));
     }
     pthread_mutex_unlock(&res_tbl_lock);
@@ -191,7 +195,7 @@ pp_resource_unref(PP_Resource resource)
             trace_error("%s, no destructor for type %d\n", __func__, ptr->resource_type);
 
         // finally, free memory occupied by resource
-        g_slice_free1(sizeof(union pp_largest_u), ptr);
+        g_slice_free1(LARGEST_RESOURCE_SIZE, ptr);
     }
 
     if (config.quirks.dump_resource_histogram) {