projects
/
feisty_meow.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'release-2.140.99'
[feisty_meow.git]
/
nucleus
/
library
/
processes
/
rendezvous.cpp
diff --git
a/nucleus/library/processes/rendezvous.cpp
b/nucleus/library/processes/rendezvous.cpp
index 3f3385e8e109c064cbc72232ad3cec02c55dd2a2..b93d07646aa83c6ef10f7f33ba7c7cd6ab523083 100644
(file)
--- a/
nucleus/library/processes/rendezvous.cpp
+++ b/
nucleus/library/processes/rendezvous.cpp
@@
-59,10
+59,7
@@
astring unix_rendez_file(const astring &lock_name)
filename::detooth_filename(clean_name);
// make sure our target directory exists.
filename::detooth_filename(clean_name);
// make sure our target directory exists.
- // this choice is only user specific.
-// astring tmp_dir = portable::env_string("TMP") + "/rendezvous";
-
- // this choice uses a system-wide location.
+ // use a system-wide location for rendezvous state files.
astring tmp_dir = "/tmp/rendezvous";
mkdir(tmp_dir.observe(), 0777);
astring tmp_dir = "/tmp/rendezvous";
mkdir(tmp_dir.observe(), 0777);
@@
-71,7
+68,7
@@
astring unix_rendez_file(const astring &lock_name)
#endif
rendezvous::rendezvous(const astring &root_name)
#endif
rendezvous::rendezvous(const astring &root_name)
-: _handle(N
IL
),
+: _handle(N
ULL_POINTER
),
_locked(false),
_root_name(new astring(root_name))
{
_locked(false),
_root_name(new astring(root_name))
{
@@
-93,7
+90,7
@@
rendezvous::rendezvous(const astring &root_name)
_handle = locking_file;
#endif
#ifdef __WIN32__
_handle = locking_file;
#endif
#ifdef __WIN32__
- _handle = CreateMutex(N
IL
, false, to_unicode_temp(lock_name));
+ _handle = CreateMutex(N
ULL_POINTER
, false, to_unicode_temp(lock_name));
if (!_handle) return;
#endif
}
if (!_handle) return;
#endif
}
@@
-123,7
+120,7
@@
rendezvous::~rendezvous()
}
fclose((FILE *)_handle);
}
fclose((FILE *)_handle);
- _handle = N
IL
;
+ _handle = N
ULL_POINTER
;
}
#endif
#ifdef __WIN32__
}
#endif
#ifdef __WIN32__