浏览代码

fixed iOS crash with memory align
fixed IOS open file with 's' flag

dmuratshin 9 年之前
父节点
当前提交
f6475c6e24
共有 2 个文件被更改,包括 12 次插入6 次删除
  1. 9 6
      oxygine/src/core/ThreadDispatcher.h
  2. 3 0
      oxygine/src/core/file.cpp

+ 9 - 6
oxygine/src/core/ThreadDispatcher.h

@@ -106,15 +106,18 @@ namespace oxygine
         void _popMessage(message&);
         void _popMessageNoCB(message&);
         void _replyLast(void* val);
-        unsigned int _id;
-        void*   _result;
-        int _replyingTo;
-
+        
+        
+        pthread_mutex_t _mutex;
+        pthread_cond_t _cond;
+        
         typedef std::vector<message> messages;
         messages _events;
         message _last;
-        pthread_cond_t _cond;
-        pthread_mutex_t _mutex;
+        
+        void*   _result;
+        unsigned int _id;
+        int _replyingTo;
     };
 
     typedef  ThreadDispatcher ThreadMessages;

+ 3 - 0
oxygine/src/core/file.cpp

@@ -102,6 +102,9 @@ namespace oxygine
 
         handle open(const char* file_, const char* mode, error_policy ep)
         {
+            if (*mode == 's')
+                ++mode;
+            
 #ifdef OX_DEBUG
             if (!strstr(mode, "b"))
                 log::warning("file::open for file '%s' should be called with 'b' (means binary) flag", file_);