s3-spoolss: move SPL_ARCH_X defines to IDL.
authorGünther Deschner <gd@samba.org>
Tue, 12 May 2009 12:12:31 +0000 (14:12 +0200)
committerGünther Deschner <gd@samba.org>
Tue, 12 May 2009 23:56:40 +0000 (01:56 +0200)
Guenther

librpc/gen_ndr/spoolss.h
librpc/idl/spoolss.idl
source3/printing/nt_printing.c

index abd8300..a9f7aaf 100644 (file)
 #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" )
index a8fd9d8..f306462 100644 (file)
@@ -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";
index b6e7032..17e3d40 100644 (file)
@@ -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 },