Revert "Need to use RETRO_BEGIN_DECLS/RETRO_END_DECL for MSVC C++"

This reverts commit 81555b9.

Author: LibretroAdmin

deps/dr/dr_flac.h

@@ -10,12 +10,12 @@ GitHub: https://github.com/mackron/dr_libs
 #ifndef DR_FLAC_H
 #define DR_FLAC_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include <stdint.h>
 #include <stddef.h> /* For size_t. */
-#include <retro_common_api.h>
-#include <retro_inline.h>
-
-RETRO_BEGIN_DECLS
 
 #define DRFLAC_STRINGIFY(x)      #x
 #define DRFLAC_XSTRINGIFY(x)     DRFLAC_STRINGIFY(x)
@@ -814,6 +814,8 @@ Set pAllocationCallbacks to the same object that was passed to drflac_open_*_and
 */
 void drflac_free(void* p, const drflac_allocation_callbacks* pAllocationCallbacks);
 
-RETRO_END_DECLS
+#ifdef __cplusplus
+}
+#endif
 
 #endif  /* DR_FLAC_H */

deps/stb/stb_rect_pack.h

@@ -31,15 +31,11 @@
  *    [your name could be here]
 */
 
-#include <stdint.h>
-#include <retro_common_api.h>
-#include <retro_inline.h>
-
-RETRO_BEGIN_DECLS
-
 #ifndef STB_INCLUDE_STB_RECT_PACK_H
 #define STB_INCLUDE_STB_RECT_PACK_H
 
+#include <stdint.h>
+
 #define STB_RECT_PACK_VERSION  1
 
 #ifdef __cplusplus
@@ -50,6 +46,43 @@ typedef struct stbrp_context stbrp_context;
 typedef struct stbrp_node    stbrp_node;
 typedef struct stbrp_rect    stbrp_rect;
 
+void stbrp_pack_rects (stbrp_context *context,
+      stbrp_rect *rects, int num_rects);
+
+/* Assign packed locations to rectangles. The rectangles are of type
+ * 'stbrp_rect' defined below, stored in the array 'rects', and there
+ * are 'num_rects' many of them.
+ *
+ * Rectangles which are successfully packed have the 'was_packed' flag
+ * set to a non-zero value and 'x' and 'y' store the minimum location
+ * on each axis (i.e. bottom-left in cartesian coordinates, top-left
+ * if you imagine y increasing downwards). Rectangles which do not fit
+ * have the 'was_packed' flag set to 0.
+ *
+ * You should not try to access the 'rects' array from another thread
+ * while this function is running, as the function temporarily reorders
+ * the array while it executes.
+ *
+ * To pack into another rectangle, you need to call stbrp_init_target
+ * again. To continue packing into the same rectangle, you can call
+ * this function again. Calling this multiple times with multiple rect
+ * arrays will probably produce worse packing results than calling it
+ * a single time with the full rectangle array, but the option is
+ * available.
+ */
+
+struct stbrp_rect
+{
+   int            id;          /* reserved for your use: */
+   uint16_t    w, h;        /* input: */
+   uint16_t    x, y;        /* output: */
+   int            was_packed;  /* non-zero if valid packing */
+}; /* 16 bytes, nominally */
+
+
+void stbrp_init_target (stbrp_context *context,
+      int width, int height, stbrp_node *nodes, int num_nodes);
+
 /* Initialize a rectangle packer to:
  *    pack a rectangle that is 'width' by 'height' in dimensions
  *    using temporary storage provided by the array 'nodes', which is 'num_nodes' long
@@ -101,42 +134,8 @@ struct stbrp_context
    stbrp_node extra[2]; /* we allocate two extra nodes so optimal user-node-count is 'width' not 'width+2' */
 };
 
-/* Assign packed locations to rectangles. The rectangles are of type
- * 'stbrp_rect' defined below, stored in the array 'rects', and there
- * are 'num_rects' many of them.
- *
- * Rectangles which are successfully packed have the 'was_packed' flag
- * set to a non-zero value and 'x' and 'y' store the minimum location
- * on each axis (i.e. bottom-left in cartesian coordinates, top-left
- * if you imagine y increasing downwards). Rectangles which do not fit
- * have the 'was_packed' flag set to 0.
- *
- * You should not try to access the 'rects' array from another thread
- * while this function is running, as the function temporarily reorders
- * the array while it executes.
- *
- * To pack into another rectangle, you need to call stbrp_init_target
- * again. To continue packing into the same rectangle, you can call
- * this function again. Calling this multiple times with multiple rect
- * arrays will probably produce worse packing results than calling it
- * a single time with the full rectangle array, but the option is
- * available.
- */
-
-struct stbrp_rect
-{
-   int            id;          /* reserved for your use: */
-   uint16_t    w, h;        /* input: */
-   uint16_t    x, y;        /* output: */
-   int            was_packed;  /* non-zero if valid packing */
-}; /* 16 bytes, nominally */
-
-void stbrp_pack_rects (stbrp_context *context,
-      stbrp_rect *rects, int num_rects);
-
-void stbrp_init_target (stbrp_context *context,
-      int width, int height, stbrp_node *nodes, int num_nodes);
-
-RETRO_END_DECLS
+#ifdef __cplusplus
+}
+#endif
 
 #endif

deps/stb/stb_truetype.h

@@ -55,15 +55,15 @@
 #include <math.h>
 #include <stdlib.h>
 #include <string.h>
-#include <retro_common_api.h>
-#include <retro_inline.h>
 
 /* INTERFACE */
 
 #ifndef __STB_INCLUDE_STB_TRUETYPE_H__
 #define __STB_INCLUDE_STB_TRUETYPE_H__
 
-RETRO_BEGIN_DECLS
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 /* NEW TEXTURE BAKING API */
 
@@ -339,6 +339,8 @@ enum
    STBTT_MS_EID_UNICODE_FULL  =10
 };
 
-RETRO_END_DECLS
+#ifdef __cplusplus
+}
+#endif
 
 #endif /* __STB_INCLUDE_STB_TRUETYPE_H__ */