s3-spoolss: move SPL_ARCH_X defines to IDL.

Guenther

diff --git a/librpc/gen_ndr/spoolss.h b/librpc/gen_ndr/spoolss.h
index abd8300d0e52ac1cd9860b80986e766f697327ba..a9f7aaf1e4172a4e287b3eb856e0a1e7b6783f5e 100644 (file)
--- a/librpc/gen_ndr/spoolss.h
+++ b/librpc/gen_ndr/spoolss.h
@@ -13,6 +13,14 @@
 #define PRINTER_STATUS_OK      ( 0x00000000 )
 #define JOB_STATUS_QUEUED      ( 0x0000 )
 #define PRINTER_ENUM_ICONMASK  ( (PRINTER_ENUM_ICON1|PRINTER_ENUM_ICON2|PRINTER_ENUM_ICON3|PRINTER_ENUM_ICON4|PRINTER_ENUM_ICON5|PRINTER_ENUM_ICON6|PRINTER_ENUM_ICON7|PRINTER_ENUM_ICON8) )
+#define SPL_ARCH_WIN40 ( "WIN40" )
+#define SPL_ARCH_W32X86        ( "W32X86" )
+#define SPL_ARCH_W32MIPS       ( "W32MIPS" )
+#define SPL_ARCH_W32ALPHA      ( "W32ALPHA" )
+#define SPL_ARCH_W32PPC        ( "W32PPC" )
+#define SPL_ARCH_IA64  ( "IA64" )
+#define SPL_ARCH_X64   ( "x64" )
+#define SPOOLSS_ARCHITECTURE_ALL       ( "all" )
 #define SPOOLSS_ARCHITECTURE_NT_X86    ( "Windows NT x86" )
 #define SPOOLSS_DEFAULT_SERVER_PATH    ( "C:\\WINDOWS\\system32\\spool" )
 #define SPL_LOCAL_PORT ( "Local Port" )

diff --git a/librpc/idl/spoolss.idl b/librpc/idl/spoolss.idl
index a8fd9d83651ccdb7b187704581ca94af7755c52a..f3064625a85eb178c88df271d885ac8a022a7687 100644 (file)
--- a/librpc/idl/spoolss.idl
+++ b/librpc/idl/spoolss.idl
@@ -1284,6 +1284,14 @@ import "misc.idl", "security.idl", "winreg.idl";
        /******************/
        /* Function: 0x1a */
 
+       const string SPL_ARCH_WIN40             = "WIN40";
+       const string SPL_ARCH_W32X86            = "W32X86";
+       const string SPL_ARCH_W32MIPS           = "W32MIPS";
+       const string SPL_ARCH_W32ALPHA          = "W32ALPHA";
+       const string SPL_ARCH_W32PPC            = "W32PPC";
+       const string SPL_ARCH_IA64              = "IA64";
+       const string SPL_ARCH_X64               = "x64";
+
        const string SPOOLSS_ARCHITECTURE_ALL                   = "all";
        const string SPOOLSS_ARCHITECTURE_NT_X86                = "Windows NT x86";
        const string SPOOLSS_DEFAULT_SERVER_PATH                = "C:\\WINDOWS\\system32\\spool";

diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c
index b6e7032ab801781d5460885ec7e6b407e85e23c6..17e3d40152aed8ca8d8f184f1262f10d1cd8529e 100644 (file)
--- a/source3/printing/nt_printing.c
+++ b/source3/printing/nt_printing.c
@@ -210,14 +210,6 @@ struct table_node {
        int     version;
 };
 
-#define SPL_ARCH_WIN40         "WIN40"
-#define SPL_ARCH_W32X86                "W32X86"
-#define SPL_ARCH_W32MIPS       "W32MIPS"
-#define SPL_ARCH_W32ALPHA      "W32ALPHA"
-#define SPL_ARCH_W32PPC                "W32PPC"
-#define SPL_ARCH_IA64          "IA64"
-#define SPL_ARCH_X64           "x64"
-
 static const struct table_node archi_table[]= {
 
        {"Windows 4.0",          SPL_ARCH_WIN40,        0 },