- removed un-necessary sendfile header
- fixed compile when streflop disabled
This commit is contained in:
parent
3d20c207d5
commit
828069087b
|
@ -867,16 +867,32 @@ static Vec2i _unprojectMap(const Vec2i& pt,const GLdouble* model,const GLdouble*
|
||||||
|
|
||||||
Vec2i pos;
|
Vec2i pos;
|
||||||
if(strcmp(label,"tl") == 0) {
|
if(strcmp(label,"tl") == 0) {
|
||||||
|
#ifdef USE_STREFLOP
|
||||||
pos = Vec2i(streflop::floor(i.x),streflop::floor(i.z));
|
pos = Vec2i(streflop::floor(i.x),streflop::floor(i.z));
|
||||||
|
#else
|
||||||
|
pos = Vec2i(floor(i.x),floor(i.z));
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
else if(strcmp(label,"tr") == 0) {
|
else if(strcmp(label,"tr") == 0) {
|
||||||
|
#ifdef USE_STREFLOP
|
||||||
pos = Vec2i(streflop::ceil(i.x),streflop::floor(i.z));
|
pos = Vec2i(streflop::ceil(i.x),streflop::floor(i.z));
|
||||||
|
#else
|
||||||
|
pos = Vec2i(ceil(i.x),floor(i.z));
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
else if(strcmp(label,"bl") == 0) {
|
else if(strcmp(label,"bl") == 0) {
|
||||||
|
#ifdef USE_STREFLOP
|
||||||
pos = Vec2i(streflop::floor(i.x),streflop::ceil(i.z));
|
pos = Vec2i(streflop::floor(i.x),streflop::ceil(i.z));
|
||||||
|
#else
|
||||||
|
pos = Vec2i(floor(i.x),ceil(i.z));
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
else if(strcmp(label,"br") == 0) {
|
else if(strcmp(label,"br") == 0) {
|
||||||
|
#ifdef USE_STREFLOP
|
||||||
pos = Vec2i(streflop::ceil(i.x),streflop::ceil(i.z));
|
pos = Vec2i(streflop::ceil(i.x),streflop::ceil(i.z));
|
||||||
|
#else
|
||||||
|
pos = Vec2i(ceil(i.x),ceil(i.z));
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
if(false) { // print debug info
|
if(false) { // print debug info
|
||||||
|
|
|
@ -30,7 +30,7 @@
|
||||||
#if defined(__FreeBSD__)
|
#if defined(__FreeBSD__)
|
||||||
#include <sys/uio.h>
|
#include <sys/uio.h>
|
||||||
#else
|
#else
|
||||||
#include <sys/sendfile.h>
|
//#include <sys/sendfile.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
|
|
Loading…
Reference in New Issue
Block a user