From d0a640ae240679701920cf1e6d95feebc0e65b85 Mon Sep 17 00:00:00 2001
From: James Davidson <james.davidson@vyatta.com>
Date: Mon, 24 Sep 2012 13:00:59 -0700
Subject: Fix get_terminal_size redefinition warning
Also squelch warnings from requiring features.ph (via ioctl.ph).
Fixes bug 8387
---
lib/Vyatta/Misc.pm | 1 -
lib/Vyatta/ioctl.pm | 5 ++++-
2 files changed, 4 insertions(+), 2 deletions(-)
(limited to 'lib')
diff --git a/lib/Vyatta/Misc.pm b/lib/Vyatta/Misc.pm
index f44dec5..fa3131c 100755
--- a/lib/Vyatta/Misc.pm
+++ b/lib/Vyatta/Misc.pm
@@ -21,7 +21,6 @@
package Vyatta::Misc;
use strict;
-use Vyatta::ioctl;
require Exporter;
diff --git a/lib/Vyatta/ioctl.pm b/lib/Vyatta/ioctl.pm
index 8ed8b93..7c745c3 100644
--- a/lib/Vyatta/ioctl.pm
+++ b/lib/Vyatta/ioctl.pm
@@ -24,7 +24,10 @@ use warnings;
use Socket;
use Socket6;
-require 'sys/ioctl.ph';
+{
+ local $^W = 0;
+ require 'sys/ioctl.ph';
+}
our @EXPORT = qw(get_terminal_size get_interface_flags);
use base qw(Exporter);
--
cgit v1.2.3