diff options
| author | Alberto Gonzalez Iniesta <agi@inittab.org> | 2017-06-22 13:16:46 +0200 |
|---|---|---|
| committer | Alberto Gonzalez Iniesta <agi@inittab.org> | 2017-06-22 13:16:46 +0200 |
| commit | 9683f890944ffb114f5f8214f694e0b339cf5a5a (patch) | |
| tree | fa391f5f343554b2861b1f8722d0a2a627e1c1fc /src/openvpn/error.h | |
| parent | 3a2bbdb05ca6a6996e424c9fb225cb0d53804125 (diff) | |
New upstream version 2.4.3upstream/2.4.3
Diffstat (limited to 'src/openvpn/error.h')
| -rw-r--r-- | src/openvpn/error.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/openvpn/error.h b/src/openvpn/error.h index df4eee7..14ef7e6 100644 --- a/src/openvpn/error.h +++ b/src/openvpn/error.h @@ -16,10 +16,9 @@ * 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 this program (see the file COPYING included with this - * distribution); if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #ifndef ERROR_H @@ -394,7 +393,8 @@ ignore_sys_error(const int err) /** Convert fatal errors to nonfatal, don't touch other errors */ static inline unsigned int -nonfatal(const unsigned int err) { +nonfatal(const unsigned int err) +{ return err & M_FATAL ? (err ^ M_FATAL) | M_NONFATAL : err; } |