diff options
| author | Timothy Pearson <[email protected]> | 2013-01-29 23:30:27 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-29 23:30:27 -0600 |
| commit | 23cc597c607088fc296c9e4bba4af31f74796d5e (patch) | |
| tree | 178a1f181d9c2f26a4c2cbcf98e659f9e87b93d4 /tsak | |
| parent | 3b20716d4754d2e854ba707857063b8329c2f46c (diff) | |
| download | tdebase-23cc597c607088fc296c9e4bba4af31f74796d5e.tar.gz tdebase-23cc597c607088fc296c9e4bba4af31f74796d5e.zip | |
Rename a few build variables for overall consistency
Diffstat (limited to 'tsak')
| -rw-r--r-- | tsak/main.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tsak/main.cpp b/tsak/main.cpp index 652466852..7bc2b8d6a 100644 --- a/tsak/main.cpp +++ b/tsak/main.cpp @@ -45,7 +45,7 @@ using namespace std; #define FIFO_DIR "/tmp/tdesocket-global" #define FIFO_FILE_OUT "/tmp/tdesocket-global/tsak" -#define FIFO_LOCKFILE_OUT "/tmp/tdesocket-global/tsak.lock" +#define FIFO_LOCTDEFILE_OUT "/tmp/tdesocket-global/tsak.lock" // WARNING // MAX_KEYBOARDS must be greater than or equal to MAX_INPUT_NODE @@ -266,7 +266,7 @@ void tearDownPipe() void tearDownLockingPipe() { close(mPipe_lockfd_out); - unlink(FIFO_LOCKFILE_OUT); + unlink(FIFO_LOCTDEFILE_OUT); } bool setFileLock(int fd, bool close_on_failure) @@ -296,7 +296,7 @@ bool checkFileLock() fl.l_whence = SEEK_SET; fl.l_len = 0; - int fd = open(FIFO_LOCKFILE_OUT, O_RDWR | O_NONBLOCK); + int fd = open(FIFO_LOCTDEFILE_OUT, O_RDWR | O_NONBLOCK); fcntl(fd, F_GETLK, &fl); /* Overwrites lock structure with preventors. */ if (fd > -1) { @@ -333,10 +333,10 @@ bool setupLockingPipe(bool writepid) umask(0); mkdir(FIFO_DIR,0644); - mknod(FIFO_LOCKFILE_OUT, 0600, 0); - chmod(FIFO_LOCKFILE_OUT, 0600); + mknod(FIFO_LOCTDEFILE_OUT, 0600, 0); + chmod(FIFO_LOCTDEFILE_OUT, 0600); - mPipe_lockfd_out = open(FIFO_LOCKFILE_OUT, O_RDWR | O_NONBLOCK); + mPipe_lockfd_out = open(FIFO_LOCTDEFILE_OUT, O_RDWR | O_NONBLOCK); if (mPipe_lockfd_out > -1) { if (writepid) { // Write my PID to the file |