Parcourir la source

Don't mark the PHYSFS_EnumFilesCallback _typedef_ as deprecated.

It upsets several compilers when building PhysicsFS itself.
Ryan C. Gordon il y a 8 ans
Parent
commit
7fcddfb741
2 fichiers modifiés avec 2 ajouts et 3 suppressions
  1. 1 2
      src/physfs.c
  2. 1 1
      src/physfs.h

+ 1 - 2
src/physfs.c

@@ -2429,8 +2429,7 @@ int PHYSFS_enumerate(const char *_fn, PHYSFS_EnumerateCallback cb, void *data)
 
 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;
 

+ 1 - 1
src/physfs.h

@@ -2288,7 +2288,7 @@ typedef void (*PHYSFS_StringCallback)(void *data, const char *str);
  * \sa PHYSFS_enumerateFilesCallback
  */
 typedef void (*PHYSFS_EnumFilesCallback)(void *data, const char *origdir,
-                                         const char *fname) PHYSFS_DEPRECATED;
+                                         const char *fname);
 
 
 /**