refactor: Remove tox_types.h; use struct tags instead.

This header was a nice idea but causes a *lot* of pain with C++ modules.

Author: iphydf

BUILD.bazel

@@ -12,7 +12,6 @@ genrule(
         "//c-toxcore/toxcore:tox_events.h",
         "//c-toxcore/toxcore:tox_options.h",
         "//c-toxcore/toxcore:tox_private.h",
-        "//c-toxcore/toxcore:tox_types.h",
         "//c-toxcore/toxencryptsave:toxencryptsave.h",
     ],
     outs = [
@@ -22,7 +21,6 @@ genrule(
         "tox/tox_events.h",
         "tox/tox_options.h",
         "tox/tox_private.h",
-        "tox/tox_types.h",
         "tox/toxencryptsave.h",
     ],
     cmd = """
@@ -32,7 +30,6 @@ genrule(
         cp $(location //c-toxcore/toxcore:tox_events.h) $(GENDIR)/c-toxcore/tox/tox_events.h
         cp $(location //c-toxcore/toxcore:tox_options.h) $(GENDIR)/c-toxcore/tox/tox_options.h
         cp $(location //c-toxcore/toxcore:tox_private.h) $(GENDIR)/c-toxcore/tox/tox_private.h
-        cp $(location //c-toxcore/toxcore:tox_types.h) $(GENDIR)/c-toxcore/tox/tox_types.h
         cp $(location //c-toxcore/toxencryptsave:toxencryptsave.h) $(GENDIR)/c-toxcore/tox/toxencryptsave.h
     """,
     visibility = ["//visibility:public"],

CMakeLists.txt

@@ -354,8 +354,6 @@ set(toxcore_SOURCES
   toxcore/tox_private.h
   toxcore/tox_pack.c
   toxcore/tox_pack.h
-  toxcore/tox_types.c
-  toxcore/tox_types.h
   toxcore/tox_unpack.c
   toxcore/tox_unpack.h
   toxcore/util.c
@@ -375,8 +373,7 @@ set(toxcore_API_HEADERS
   ${toxcore_SOURCE_DIR}/toxcore/tox.h^tox
   ${toxcore_SOURCE_DIR}/toxcore/tox_dispatch.h^tox
   ${toxcore_SOURCE_DIR}/toxcore/tox_events.h^tox
-  ${toxcore_SOURCE_DIR}/toxcore/tox_options.h^tox
-  ${toxcore_SOURCE_DIR}/toxcore/tox_types.h^tox)
+  ${toxcore_SOURCE_DIR}/toxcore/tox_options.h^tox)
 if(EXPERIMENTAL_API)
   set(toxcore_API_HEADERS ${toxcore_API_HEADERS}
     ${toxcore_SOURCE_DIR}/toxcore/tox_private.h^tox)

other/docker/pkgsrc/pkgsrc.patch

@@ -14,12 +14,11 @@ diff --git a/chat/toxcore/PLIST b/chat/toxcore/PLIST
 index f0a5e4f04..4122b0867 100644
 --- a/chat/toxcore/PLIST
 +++ b/chat/toxcore/PLIST
-@@ -4,11 +4,13 @@ bin/tox-bootstrapd
+@@ -4,11 +4,12 @@ bin/tox-bootstrapd
  include/tox/tox.h
  include/tox/tox_dispatch.h
  include/tox/tox_events.h
 +include/tox/tox_options.h
-+include/tox/tox_types.h
  include/tox/toxav.h
  include/tox/toxencryptsave.h
  lib/libtoxcore.a

toxcore/BUILD.bazel

@@ -8,7 +8,6 @@ exports_files(
         "tox_events.h",
         "tox_options.h",
         "tox_private.h",
-        "tox_types.h",
     ],
     visibility = ["//c-toxcore:__subpackages__"],
 )
@@ -1074,23 +1073,13 @@ cc_library(
     ],
 )
 
-cc_library(
-    name = "tox_types",
-    srcs = ["tox_types.c"],
-    hdrs = ["tox_types.h"],
-    visibility = ["//c-toxcore:__subpackages__"],
-)
-
 cc_library(
     name = "tox_options",
     srcs = ["tox_options.c"],
     hdrs = ["tox_options.h"],
     copts = ["-UTOX_HIDE_DEPRECATED"],
     visibility = ["//c-toxcore:__subpackages__"],
-    deps = [
-        ":ccompat",
-        ":tox_types",
-    ],
+    deps = [":ccompat"],
 )
 
 cc_library(
@@ -1126,7 +1115,6 @@ cc_library(
         ":onion_client",
         ":state",
         ":tox_options",
-        ":tox_types",
         ":util",
         "//c-toxcore/toxencryptsave:defines",
         "@pthread",

toxcore/Makefile.inc

@@ -2,8 +2,7 @@ lib_LTLIBRARIES += libtoxcore.la
 
 libtoxcore_la_include_HEADERS = \
                         ../toxcore/tox.h \
-                        ../toxcore/tox_options.h \
-                        ../toxcore/tox_types.h
+                        ../toxcore/tox_options.h
 
 libtoxcore_la_includedir = $(includedir)/tox
 
@@ -145,8 +144,6 @@ libtoxcore_la_SOURCES = ../third_party/cmp/cmp.c \
                         ../toxcore/tox_private.c \
                         ../toxcore/tox_private.h \
                         ../toxcore/tox_struct.h \
-                        ../toxcore/tox_types.c \
-                        ../toxcore/tox_types.h \
                         ../toxcore/tox_unpack.c \
                         ../toxcore/tox_unpack.h \
                         ../toxcore/tox.c \

toxcore/tox.h

@@ -103,7 +103,6 @@
 #include <stdint.h>
 
 #include "tox_options.h"  // IWYU pragma: export
-#include "tox_types.h"  // IWYU pragma: export
 
 #ifdef __cplusplus
 extern "C" {
@@ -120,7 +119,7 @@ extern "C" {
  * device is limited. Note that this is not just a per-process limit, since the
  * limiting factor is the number of usable ports on a device.
  */
-struct Tox;
+typedef struct Tox Tox;
 
 /** @{
  * @name API version

toxcore/tox_options.h

@@ -10,12 +10,12 @@
 #include <stddef.h>
 #include <stdint.h>
 
-#include "tox_types.h"  // IWYU pragma: export
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+struct Tox;
+
 /** @{
  * @name Startup options
  */
@@ -117,8 +117,9 @@ const char *tox_log_level_to_string(Tox_Log_Level value);
  * @param message The log message.
  * @param user_data The user data pointer passed to tox_new in options.
  */
-typedef void tox_log_cb(Tox *tox, Tox_Log_Level level, const char *file, uint32_t line,
-                        const char *func, const char *message, void *user_data);
+typedef void tox_log_cb(struct Tox *tox, Tox_Log_Level level, const char *file,
+                        uint32_t line, const char *func, const char *message,
+                        void *user_data);
 
 /**
  * @brief This struct contains all the startup options for Tox.
@@ -135,7 +136,7 @@ typedef void tox_log_cb(Tox *tox, Tox_Log_Level level, const char *file, uint32_
  *   members. The struct will become opaque (i.e. the definition will become
  *   private) in v0.3.0.
  */
-struct Tox_Options;
+typedef struct Tox_Options Tox_Options;
 
 #ifndef TOX_HIDE_DEPRECATED
 struct Tox_Options {

toxcore/tox_private.c

@@ -12,7 +12,6 @@
 
 #include "DHT.h"
 #include "TCP_server.h"
-#include "attributes.h"
 #include "ccompat.h"
 #include "crypto_core.h"
 #include "group_chats.h"
@@ -23,7 +22,7 @@
 #include "net_profile.h"
 #include "network.h"
 #include "tox.h"
-#include "tox_struct.h"
+#include "tox_struct.h"  // IWYU pragma: keep
 
 #define SET_ERROR_PARAMETER(param, x) \
     do {                              \

toxcore/tox_private.h

@@ -11,7 +11,7 @@
 #include <stdint.h>
 
 #include "tox.h"
-#include "tox_types.h"
+#include "tox_options.h"
 
 #ifdef __cplusplus
 extern "C" {