churchyard / rpms / blender

Forked from rpms/blender 5 years ago
Clone
c19486d
--- a/intern/ghost/intern/GHOST_WindowX11.cpp
c19486d
+++ b/intern/ghost/intern/GHOST_WindowX11.cpp
c19486d
@@ -106,7 +106,7 @@ typedef struct {
c19486d
  */
c19486d
 
c19486d
 /* See the python script above to regenerate the 48x48 icon within blender */
c19486d
-static long BLENDER_ICON_48x48x32[] = {
ae97f06
+static const unsigned long BLENDER_ICON_48x48x32[] = {
c19486d
 	48,48,
c19486d
 	4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303,
c19486d
 	4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303, 4671303,
c19486d
--- a/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
c19486d
+++ b/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
c19486d
@@ -55,12 +55,13 @@
c19486d
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
c19486d
 // OTHER DEALINGS IN THE SOFTWARE.
c19486d
 
c19486d
+// Include stdlib first to restore undefined min/max behavior w/ GCC 6
c19486d
+#include <stdlib.h>  // malloc
c19486d
 #include <DirectDrawSurface.h>
c19486d
 #include <BlockDXT.h>
c19486d
 #include <PixelFormat.h>
c19486d
 
c19486d
 #include <stdio.h> // printf
c19486d
-#include <stdlib.h>  // malloc
c19486d
 #include <math.h>  // sqrt
c19486d
 #include <sys/types.h>
c19486d