From: Florian Ragwitz <rafl@debian.org>
Date: Sun, 19 Apr 2009 09:07:10 +0000 (+0200)
Subject: Merge commit 'origin/master' into xs_attrs
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=a9403db71ac22251d77147d4c2880e5b14537337;p=gitmo%2FClass-MOP.git

Merge commit 'origin/master' into xs_attrs

* commit 'origin/master': (172 commits)
  Push to origin after tagging
  Don't define new() in this benchmark, make_immutable creates one
  Fix a speling error in Changes
  update Changes
  Document deprecation fixes
  Pass @_ from deprecation wrapper
  warn if we aren't going to inline a constructor because one is already
  pass in args for all deprecated methods
  bump version to 0.81
  Update changes for release
  Changelogging.
  Avoid c compiler warnings by declaring some unused function arguments.
  Include stack traces in the deprecation warnings.
  Make _initialize_body private to match other classes
  Add date for release
  bump version to 0.80_01
  Handle undef without warnings in class_of
  Make the deprecation warning for attributes match all other similar
  Tweak changes to be a bit more useful
  Document all the renames and deprecations in changes
  ...

Conflicts:
	Makefile.PL
---

a9403db71ac22251d77147d4c2880e5b14537337
diff --cc Makefile.PL
index a8c8613,ef1680f..a07677a
--- a/Makefile.PL
+++ b/Makefile.PL
@@@ -10,7 -10,8 +10,8 @@@ perl_version '5.008001'
  all_from 'lib/Class/MOP.pm';
  license 'perl';
  
- my $ccflags = ' -Iinclude';
+ require Config;
 -my $ccflags = ( $Config::Config{ccflags} || '' ) . ' -I.';
++my $ccflags = ( $Config::Config{ccflags} || '' ) . ' -Iinclude';
  $ccflags .= ' -Wall' if -d '.svn' || -d '.git' || $ENV{MAINTAINER_MODE};
  
  requires 'Carp';
diff --cc include/mop.h
index 217ed8b,288c8ad..feea8db
--- a/include/mop.h
+++ b/include/mop.h
@@@ -12,11 -10,12 +12,15 @@@
  #define NEED_sv_2pv_nolen
  #include "ppport.h"
  
 +#include "mop_attr.h"
 +#include "mop_instance.h"
 +
  #define MOP_CALL_BOOT(name)  mop_call_xs(aTHX_ name, cv, mark);
  
+ #ifndef XSPROTO
+ #define XSPROTO(name) XS(name)
+ #endif
+ 
  void mop_call_xs (pTHX_ XSPROTO(subaddr), CV *cv, SV **mark);
  
  typedef enum {