--- deliantra/server/include/rmg.h	2010/08/22 20:36:37	1.2
+++ deliantra/server/include/rmg.h	2012/01/03 11:25:32	1.5
@@ -1,7 +1,7 @@
 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  * 
- * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 2001 Mark Wedel & Crossfire Development Team
  * Copyright (©) 1992 Frank Tore Johansen
  * 
@@ -50,7 +50,7 @@
   shstr_tmp as_shstr () const;
 
   // fetch something from the options hash
-  SV               *get_sv  (const char *option) const;
+  SV               *opt_sv  (const char *option) const; // avoid clashing with perl's get_sv macro
   const_utf8_string get_str (const char *option, const_utf8_string fallback = "") const;
   IV                get_iv  (const char *option, IV                fallback =  0) const;
   UV                get_uv  (const char *option, UV                fallback =  0) const;