Don't mark the PHYSFS_EnumFilesCallback _typedef_ as deprecated.
authorRyan C. Gordon <icculus@icculus.org>
Sat, 12 Aug 2017 03:06:06 -0400
changeset 1563 4633843067dc
parent 1562 2d0eab83ebb7
child 1564 62c27f6efeed
Don't mark the PHYSFS_EnumFilesCallback _typedef_ as deprecated. It upsets several compilers when building PhysicsFS itself.
src/physfs.c
src/physfs.h
--- a/src/physfs.c	Sat Aug 12 02:39:24 2017 -0400
+++ b/src/physfs.c	Sat Aug 12 03:06:06 2017 -0400
@@ -2429,8 +2429,7 @@
 
 typedef struct
 {
-    /* can't use the typedef because it might trigger deprecation warnings. */
-    void (*callback)(void *data, const char *origdir, const char *fname);
+    PHYSFS_EnumFilesCallback callback;
     void *data;
 } LegacyEnumFilesCallbackData;
 
--- a/src/physfs.h	Sat Aug 12 02:39:24 2017 -0400
+++ b/src/physfs.h	Sat Aug 12 03:06:06 2017 -0400
@@ -2288,7 +2288,7 @@
  * \sa PHYSFS_enumerateFilesCallback
  */
 typedef void (*PHYSFS_EnumFilesCallback)(void *data, const char *origdir,
-                                         const char *fname) PHYSFS_DEPRECATED;
+                                         const char *fname);
 
 
 /**