Context Navigation

Ticket #406: gemrb-0.6-git.patch

File gemrb-0.6-git.patch, 1.3 KB (added by michaelvoliveira, 5 years ago)
Patch to get rid of the last #pragma, since that this is the only file that was not accepted into official repository

diff -Naur gemrb-0.6-git/gemrb/plugins/BIKPlayer/BIKPlayer.cpp gemrb-0.6-git-haiku/gemrb/plugins/BIKPlayer/BIKPlayer.cpp

-                      old
+                      new
         const uint8_t *scan;
         const uint32_t *quant;
         int xoff, yoff;
+#if !defined(__HAIKU__)
 #pragma pack(push,16)
+#endif
         DCTELEM block[64];
+#if !defined(__HAIKU__)
 #pragma pack(pop)
+#endif
         int bits = data_size*8;
         v_gb.init_get_bits((uint8_t *) data, bits);

diff -Naur gemrb-0.6-git/gemrb/plugins/BIKPlayer/BIKPlayer.h gemrb-0.6-git-haiku/gemrb/plugins/BIKPlayer/BIKPlayer.h

-                      old
+                      new
         bool s_audio;
         int s_stream;  //openal stream handle
+#if !defined(__HAIKU__)
 #pragma pack(push,16)
+#endif
         FFTSample s_coeffs[BINK_BLOCK_MAX_SIZE];
         short s_previous[BINK_BLOCK_MAX_SIZE / 16];  ///< coeffs from previous audio block
+#if !defined(__HAIKU__)
 #pragma pack(pop)
+#endif
         float *s_coeffs_ptr[MAX_CHANNELS]; ///< pointers to the coeffs arrays for float_to_int16_interleave