diff -ur orig/SM.xs updated/SM.xs
--- orig/SM.xs	Thu May  3 11:17:53 2001
+++ updated/SM.xs	Sun Dec  7 18:14:59 2003
@@ -8,14 +8,26 @@
 #include "config.h"
 #include "clibrary.h"
 #include "libinn.h"
-#include "macros.h"
 #include "paths.h"
+#include "storage.h"
+#if INN_VERSION < 20400
+#include "macros.h"
 #include "qio.h"
+#else
+#include "inn/innconf.h"
+#include "inn/qio.h"
+#endif
 
 #ifdef __cplusplus
 }
 #endif
 
+#if INN_VERSION >= 20400
+#define BOOL bool
+#define TRUE true
+#define FALSE false
+#endif
+
 void
 set_char_var(char *name, char *value)
 {
@@ -72,7 +84,9 @@
   SET_INT_VAR(refusecybercancels);
   SET_INT_VAR(remembertrash);
   SET_CHAR_VAR(sourceaddress);
+#if INN_VERSION < 20400
   SET_INT_VAR(usecontrolchan);
+#endif
   SET_INT_VAR(verifycancels);
   SET_INT_VAR(wanttrash);
 #if INN_VERSION >= 20300
@@ -104,10 +118,12 @@
   SET_INT_VAR(articlemmap);
   SET_INT_VAR(clienttimeout);
   SET_INT_VAR(nnrpdcheckart);
+#if INN_VERSION < 20400
   SET_INT_VAR(nnrpperlauth);
 #if INN_VERSION >= 20300
   SET_INT_VAR(nnrppythonauth);
 #endif
+#endif
   SET_INT_VAR(noreader);
   SET_INT_VAR(readerswhenstopped);
   SET_INT_VAR(readertrack);
@@ -140,12 +156,22 @@
   SET_INT_VAR(strippostcc);
 
   /* Posting -- Exponential Backoff */
+#if INN_VERSION < 20400
   SET_INT_VAR(backoff_auth);
   SET_CHAR_VAR(backoff_db);
   SET_INT_VAR(backoff_k);
   SET_INT_VAR(backoff_postfast);
   SET_INT_VAR(backoff_postslow);
   SET_INT_VAR(backoff_trigger);
+#else
+  SET_INT_VAR(backoffauth);
+  SET_CHAR_VAR(backoffdb);
+  SET_INT_VAR(backoffk);
+  SET_INT_VAR(backoffpostfast);
+  SET_INT_VAR(backoffpostslow);
+  SET_INT_VAR(backofftrigger);
+#endif
+
 
   /* Logging */
   SET_INT_VAR(logartsize);
@@ -295,7 +321,7 @@
   RETVAL = 0;
 
   for (i = 0 ; i < items ; ++i) {
-    text = (char *)SvPV(ST(i), na);
+    text = (char *)SvPV(ST(i), PL_na);
 
     if (IsToken(text))
       if (SMcancel(TextToToken(text)))