Added check for _last_of for fileName and merged all definitions for socklen_t
to one line.
This commit is contained in:
@@ -207,7 +207,7 @@ class NetReader : public osgDB::ReaderWriter
|
||||
|
||||
|
||||
std::string fileName;
|
||||
int index = inFileName.find(":");
|
||||
int index = inFileName.find_last_of(":");
|
||||
// If we haven't been given a hostname as an option
|
||||
// and it hasn't been prefixed to the name, we fail
|
||||
if( index != -1 )
|
||||
|
||||
@@ -64,7 +64,7 @@
|
||||
#include <sstream>
|
||||
#include <string>
|
||||
|
||||
#if defined(__APPLE__)
|
||||
#if defined(__APPLE__) || defined(WIN32) || defined (__sgi) || defined (__hpux)
|
||||
typedef int socklen_t;
|
||||
#endif
|
||||
|
||||
@@ -127,9 +127,6 @@ extern "C" {
|
||||
#include <sys/filio.h>
|
||||
#endif
|
||||
|
||||
#ifdef __sgi
|
||||
typedef int socklen_t;
|
||||
#endif
|
||||
|
||||
#ifndef BUFSIZ
|
||||
# define BUFSIZ 1024
|
||||
|
||||
Reference in New Issue
Block a user