Fixed a few issues for Linux build:
- Quick change of _mkdir into mkdir (really, this should be done with a library function, which Jan is working on). - Moved CJSComplex::GetScript() implementation into its .h file from its .inl file to avoid some link errors in release build due to inlining. This was SVN commit r4994.
This commit is contained in:
parent
104118b7e0
commit
cf21949640
@ -40,6 +40,9 @@
|
||||
|
||||
#if OS_WIN
|
||||
#include <direct.h> // _mkdir
|
||||
#else
|
||||
#include <sys/stat.h>
|
||||
#include <sys/types.h>
|
||||
#endif
|
||||
|
||||
|
||||
@ -230,7 +233,11 @@ LibError dir_create(const char* P_path)
|
||||
return INFO::ALREADY_EXISTS;
|
||||
|
||||
errno = 0;
|
||||
#if OS_WIN
|
||||
ret = _mkdir(N_path);
|
||||
#else
|
||||
ret = mkdir(N_path, 0777);
|
||||
#endif
|
||||
return LibError_from_posix(ret);
|
||||
}
|
||||
|
||||
|
@ -196,7 +196,7 @@ public:
|
||||
* Destructor
|
||||
*
|
||||
**/
|
||||
~CStr() {};
|
||||
//~CStr() {};
|
||||
|
||||
// Conversions:
|
||||
|
||||
|
@ -175,12 +175,17 @@ public:
|
||||
|
||||
public:
|
||||
|
||||
JSObject* GetScript();
|
||||
// Creating and releasing script objects is done automatically most of the time, but you
|
||||
// can do it explicitly.
|
||||
void CreateScriptObject();
|
||||
void ReleaseScriptObject();
|
||||
|
||||
|
||||
JSObject* GetScript()
|
||||
{
|
||||
if( !m_JS )
|
||||
CreateScriptObject();
|
||||
return( m_JS );
|
||||
}
|
||||
|
||||
CJSComplex();
|
||||
virtual ~CJSComplex();
|
||||
|
@ -720,16 +720,6 @@ void CJSComplex<T, ReadOnly>::DefaultFinalize( JSContext *cx, JSObject *obj )
|
||||
JS_SetPrivate( cx, obj, NULL );
|
||||
}
|
||||
|
||||
|
||||
template<typename T, bool ReadOnly>
|
||||
JSObject* CJSComplex<T, ReadOnly>::GetScript()
|
||||
{
|
||||
if( !m_JS )
|
||||
CreateScriptObject();
|
||||
return( m_JS );
|
||||
}
|
||||
|
||||
|
||||
// Creating and releasing script objects is done automatically most of the time, but you
|
||||
// can do it explicitly.
|
||||
template<typename T, bool ReadOnly>
|
||||
|
Loading…
Reference in New Issue
Block a user