#include <mach-o/dyld.h>
#include <limits.h>
#endif
-#ifdef __WIN32__
+#ifdef _MSC_VER
#include <direct.h>
#include <process.h>
#else
#include <dirent.h>
-#endif
-#ifdef __UNIX__
#include <sys/utsname.h>
#include <unistd.h>
#endif
const int MAXIMUM_COMMAND_LINE = 32 * KILOBYTE;
// maximum command line that we'll deal with here.
-#ifdef __UNIX__
+#if defined(__UNIX__) || defined(__GNU_WINDOWS__)
astring application_configuration::get_cmdline_from_proc()
{
FUNCDEF("get_cmdline_from_proc");
uint32_t buffsize = MAX_ABS_PATH - 1;
_NSGetExecutablePath(buffer, &buffsize);
to_return = (char *)buffer;
-#elif __UNIX__
+#elif defined(__UNIX__) || defined(__GNU_WINDOWS__)
to_return = get_cmdline_from_proc();
-#elif defined(__WIN32__)
+#elif defined(_MSC_VER)
flexichar low_buff[MAX_ABS_PATH + 1];
- GetModuleFileName(NIL, low_buff, MAX_ABS_PATH - 1);
+ GetModuleFileName(NULL_POINTER, low_buff, MAX_ABS_PATH - 1);
astring buff = from_unicode_temp(low_buff);
buff.to_lower(); // we lower-case the name since windows seems to UC it.
to_return = buff;
return to_return;
}
-#if defined(__UNIX__) || defined(__WIN32__)
+#if defined(__UNIX__) || defined(_MSC_VER) || defined(__GNU_WINDOWS__)
basis::un_int application_configuration::process_id() { return getpid(); }
#else
#pragma error("hmmm: need process id implementation for this OS!")
char buff[MAX_ABS_PATH];
getcwd(buff, MAX_ABS_PATH - 1);
to_return = buff;
-#elif defined(__WIN32__)
+#elif defined(_MSC_VER)
flexichar low_buff[MAX_ABS_PATH + 1];
GetCurrentDirectory(MAX_ABS_PATH, low_buff);
to_return = from_unicode_temp(low_buff);
utsname kernel_parms;
uname(&kernel_parms);
to_return = version(kernel_parms.release);
-#elif defined(__WIN32__)
+#elif defined(_MSC_VER)
OSVERSIONINFO info;
info.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
::GetVersionEx(&info);
// now we make sure the directory exists.
filename testing(log_dir);
if (!testing.exists()) {
- bool okay = directory::make_directory(log_dir);
+ bool okay = directory::recursive_create(log_dir);
if (!okay) {
LOG(astring("failed to create logging directory: ") + log_dir);
// return a directory almost guaranteed to exist; best we can do in this case.