Applied patch ready for merge

[sdlgit/SDL_perl.git] / lib / SDL.pm

diff --git a/lib/SDL.pm b/lib/SDL.pm
index e7f88cb..6f012ba 100644 (file)
--- a/lib/SDL.pm
+++ b/lib/SDL.pm
@@ -1,10 +1,39 @@
+#!/usr/bin/env perl
 #
-# Copyright (C) 2004 David J. Goehrig
+# SDL.pm
 #
+# Copyright (C) 2005 David J. Goehrig <dgoehrig@cpan.org>
+#
+# ------------------------------------------------------------------------------
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+# 
+# This library 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
+# Lesser General Public License for more details.
+# 
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ------------------------------------------------------------------------------
+#
+# Please feel free to send questions, suggestions or improvements to:
+#
+#      David J. Goehrig
+#      dgoehrig@cpan.org
+# Copyright (C) 2009 Kartik Thakore
 
 package SDL;
 
 use strict;
+use warnings;
+use Carp;
+
 use vars qw($VERSION @ISA @EXPORT @EXPORT_OK);
 
 require Exporter;
@@ -16,14 +45,10 @@ use SDL::Constants;
 BEGIN {
        @ISA = qw(Exporter DynaLoader);
        @EXPORT = qw( in verify &NULL );
-       # reexport all SDL constants
-       for (@SDL::Constants::EXPORT) {
-               push @EXPORT,$_;
-       }
 };
 
 
-$VERSION = '2.1.3';
+$VERSION = '2.2.1';
 
 print "$VERSION" if (defined($ARGV[0]) && ($ARGV[0] eq '--SDLperl'));
 
@@ -41,7 +66,7 @@ sub in {
 sub verify (\%@) {
        my ($options,@valid_options) = @_;
        for (keys %$options) {
-               die "Invalid option $_\n" unless in ($_, @valid_options);
+               croak "Invalid option $_\n" unless in ($_, @valid_options);
        }
 }