From 75666168b7ed968bbf36d7e547137144d0a9b59e Mon Sep 17 00:00:00 2001 From: Emanuele Giaquinta Date: Sun, 30 Nov 2008 14:33:14 +0000 Subject: [PATCH] Do not check for fcntl. git-svn-id: file:///var/www/svn.irssi.org/SVN/irssi/trunk@4931 dbcabf3a-b0e7-0310-adc4-f8d773084564 --- configure.in | 2 -- src/core/log.c | 6 ------ 2 files changed, 8 deletions(-) diff --git a/configure.in b/configure.in index a32034f5..c10a0493 100644 --- a/configure.in +++ b/configure.in @@ -178,8 +178,6 @@ case "$host_os" in esac -AC_CHECK_FUNCS(fcntl) - AC_CHECK_FUNC(socket, [], [ AC_CHECK_LIB(socket, socket, [ LIBS="$LIBS -lsocket" diff --git a/src/core/log.c b/src/core/log.c index bc0e869f..d2a5abaa 100644 --- a/src/core/log.c +++ b/src/core/log.c @@ -32,9 +32,7 @@ #define DEFAULT_LOG_FILE_CREATE_MODE 600 -#ifdef HAVE_FCNTL static struct flock lock; -#endif GSList *logs; @@ -129,7 +127,6 @@ int log_start_logging(LOG_REC *log) log->failed = TRUE; return FALSE; } -#ifdef HAVE_FCNTL memset(&lock, 0, sizeof(lock)); lock.l_type = F_WRLCK; if (fcntl(log->handle, F_SETLK, &lock) == -1 && errno == EACCES) { @@ -139,7 +136,6 @@ int log_start_logging(LOG_REC *log) log->failed = TRUE; return FALSE; } -#endif lseek(log->handle, 0, SEEK_END); log->opened = log->last = time(NULL); @@ -165,11 +161,9 @@ void log_stop_logging(LOG_REC *log) settings_get_str("log_close_string"), "\n", time(NULL)); -#ifdef HAVE_FCNTL memset(&lock, 0, sizeof(lock)); lock.l_type = F_UNLCK; fcntl(log->handle, F_SETLK, &lock); -#endif write_buffer_flush(); close(log->handle);