edo9300 / irrlicht1-8-4 Goto Github PK

@@ -16,6 +16,27 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
+ *  Copyright (C) 2011-2017 - Daniel De Matteis
+ *
+ *  RetroArch is free software: you can redistribute it and/or modify it under the terms
+ *  of the GNU General Public License as published by the Free Software Found-
+ *  ation, either version 3 of the License, or (at your option) any later version.
+ *
+ *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ *  PURPOSE.  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with RetroArch.
+ *  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#define WL_ARRAY_FOR_EACH(pos, array, type) \
+    for (pos = (type)(array)->data; \
+            (const char *) pos < ((const char *) (array)->data + (array)->size); \
+            (pos)++)
+
 #include "CIrrDeviceWaylandKeycodesWorkaround.h"
 
 #include "CIrrDeviceWayland.h"
@@ -852,9 +873,9 @@ public:
     {
         CIrrDeviceWayland* device = static_cast<CIrrDeviceWayland*>(data);
 
-        void* state_p;
+        const uint32_t* state_p;
         bool fullscreen = false;
-        wl_array_for_each(state_p, states) {
+        WL_ARRAY_FOR_EACH(state_p, states, const uint32_t*) {
             if(*(xdg_toplevel_state*)state_p == XDG_TOPLEVEL_STATE_FULLSCREEN) {
                 fullscreen = true;
             }
@@ -917,9 +938,9 @@ public:
     {
         CIrrDeviceWayland* device = static_cast<CIrrDeviceWayland*>(data);
 
-        void* state_p;
+        const uint32_t* state_p;
         bool fullscreen = false;
-        wl_array_for_each(state_p, states) {
+        WL_ARRAY_FOR_EACH(state_p, states, const uint32_t*) {
             if(*(zxdg_toplevel_v6_state*)state_p == ZXDG_TOPLEVEL_V6_STATE_FULLSCREEN) {
                 fullscreen = true;
             }