fix for building on windows, clear some warnings too
This commit is contained in:
@@ -1153,14 +1153,19 @@ endif()
|
||||
|
||||
|
||||
# set the endian define
|
||||
include(TestBigEndian)
|
||||
test_big_endian(_SYSTEM_BIG_ENDIAN)
|
||||
if(_SYSTEM_BIG_ENDIAN)
|
||||
add_definitions(-D__BIG_ENDIAN__)
|
||||
else()
|
||||
if(MSVC)
|
||||
# for some reason this fails on msvc
|
||||
add_definitions(-D__LITTLE_ENDIAN__)
|
||||
else()
|
||||
include(TestBigEndian)
|
||||
test_big_endian(_SYSTEM_BIG_ENDIAN)
|
||||
if(_SYSTEM_BIG_ENDIAN)
|
||||
add_definitions(-D__BIG_ENDIAN__)
|
||||
else()
|
||||
add_definitions(-D__LITTLE_ENDIAN__)
|
||||
endif()
|
||||
unset(_SYSTEM_BIG_ENDIAN)
|
||||
endif()
|
||||
unset(_SYSTEM_BIG_ENDIAN)
|
||||
|
||||
|
||||
if(WITH_IMAGE_OPENJPEG)
|
||||
|
@@ -257,7 +257,11 @@ int frameserver_loop(RenderData *rd, ReportList *UNUSED(reports))
|
||||
struct timeval tv;
|
||||
struct sockaddr_in addr;
|
||||
int len, rval;
|
||||
#ifdef FREE_WINDOWS
|
||||
int socklen;
|
||||
#else
|
||||
unsigned int socklen;
|
||||
#endif
|
||||
char buf[4096];
|
||||
|
||||
if (connsock != -1) {
|
||||
|
@@ -488,7 +488,7 @@ LinkNode *BLI_read_file_as_lines(const char *name)
|
||||
|
||||
buf= MEM_mallocN(size, "file_as_lines");
|
||||
if (buf) {
|
||||
int i, last= 0;
|
||||
size_t i, last= 0;
|
||||
|
||||
/*
|
||||
* size = because on win32 reading
|
||||
|
@@ -301,7 +301,7 @@ char* dirname(char *path)
|
||||
{
|
||||
char *p;
|
||||
if( path == NULL || *path == '\0' )
|
||||
return ".";
|
||||
return ".";
|
||||
p = path + strlen(path) - 1;
|
||||
while( *p == '/' ) {
|
||||
if( p == path )
|
||||
@@ -309,11 +309,11 @@ char* dirname(char *path)
|
||||
*p-- = '\0';
|
||||
}
|
||||
while( p >= path && *p != '/' )
|
||||
p--;
|
||||
p--;
|
||||
return
|
||||
p < path ? "." :
|
||||
p == path ? "/" :
|
||||
(*p = '\0', path);
|
||||
p < path ? "." :
|
||||
p == path ? "/" :
|
||||
(*p = '\0', path);
|
||||
}
|
||||
/* End of copied part */
|
||||
|
||||
|
@@ -34,6 +34,7 @@
|
||||
#ifndef UI_INTERFACE_H
|
||||
#define UI_INTERFACE_H
|
||||
|
||||
#include "BLO_sys_types.h" /* size_t */
|
||||
#include "RNA_types.h"
|
||||
#include "DNA_userdef_types.h"
|
||||
|
||||
|
@@ -33,6 +33,7 @@
|
||||
#ifndef ED_NODE_INTERN_H
|
||||
#define ED_NODE_INTERN_H
|
||||
|
||||
#include <stddef.h> /* for size_t */
|
||||
#include "UI_interface.h"
|
||||
|
||||
/* internal exports only */
|
||||
|
Reference in New Issue
Block a user