diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-18 13:55:16 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-18 13:55:16 +0100 |
| commit | c9b70abf1a7a40b5afc80975d016980dd4e63e36 (patch) | |
| tree | 33171a0c1dae68dc1ab650e3ab24bd973584cf84 /plugins/imptcp | |
| parent | fe4cfa6d1f37aaac61a7cbab03df30ac1909f5cf (diff) | |
| parent | 92f7e549df5a1333f037cf3b290e3087fd9ad5da (diff) | |
| download | rsyslog-c9b70abf1a7a40b5afc80975d016980dd4e63e36.tar.gz rsyslog-c9b70abf1a7a40b5afc80975d016980dd4e63e36.tar.xz rsyslog-c9b70abf1a7a40b5afc80975d016980dd4e63e36.zip | |
Merge branch 'v5-stable' into v6-stable
Conflicts:
ChangeLog
configure.ac
doc/manual.html
plugins/imptcp/imptcp.c
Diffstat (limited to 'plugins/imptcp')
| -rw-r--r-- | plugins/imptcp/imptcp.c | 33 |
1 files changed, 16 insertions, 17 deletions
diff --git a/plugins/imptcp/imptcp.c b/plugins/imptcp/imptcp.c index 33277148..130ca15f 100644 --- a/plugins/imptcp/imptcp.c +++ b/plugins/imptcp/imptcp.c @@ -10,24 +10,23 @@ * * File begun on 2010-08-10 by RGerhards * - * Copyright 2007-2011 Rainer Gerhards and Adiscon GmbH. + * Copyright 2007-2012 Rainer Gerhards and Adiscon GmbH. * * This file is part of rsyslog. * - * Rsyslog is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Rsyslog is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Rsyslog. If not, see <http://www.gnu.org/licenses/>. - * - * A copy of the GPL can be found in the file "COPYING" in this distribution. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * -or- + * see COPYING.ASL20 in the source distribution + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ #include "config.h" #if !defined(HAVE_EPOLL_CREATE) @@ -1175,11 +1174,11 @@ CODESTARTwillRun ABORT_FINALIZE(RS_RET_NO_RUN); } -#if defined(EPOLL_CLOEXEC) && defined(HAVE_EPOLL_CREATE1) +# if defined(EPOLL_CLOEXEC) && defined(HAVE_EPOLL_CREATE1) DBGPRINTF("imptcp uses epoll_create1()\n"); epollfd = epoll_create1(EPOLL_CLOEXEC); if(epollfd < 0 && errno == ENOSYS) -#endif +# endif { DBGPRINTF("imptcp uses epoll_create()\n"); /* reading the docs, the number of epoll events passed to |