diff options
| author | Günther Deschner <gd@samba.org> | 2009-05-12 14:12:31 +0200 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2009-05-13 01:56:40 +0200 |
| commit | 7403dd39d608e07f107530819277738ebd20a320 (patch) | |
| tree | d596efd9ef1ed99e80c71fede765c6e3250deea8 | |
| parent | a4f558da79e5746124b79583ca608b394e635ad3 (diff) | |
| download | samba-7403dd39d608e07f107530819277738ebd20a320.tar.gz samba-7403dd39d608e07f107530819277738ebd20a320.tar.bz2 samba-7403dd39d608e07f107530819277738ebd20a320.zip | |
s3-spoolss: move SPL_ARCH_X defines to IDL.
Guenther
| -rw-r--r-- | librpc/gen_ndr/spoolss.h | 8 | ||||
| -rw-r--r-- | librpc/idl/spoolss.idl | 8 | ||||
| -rw-r--r-- | source3/printing/nt_printing.c | 8 |
3 files changed, 16 insertions, 8 deletions
diff --git a/librpc/gen_ndr/spoolss.h b/librpc/gen_ndr/spoolss.h index abd8300d0e..a9f7aaf1e4 100644 --- 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 a8fd9d8365..f3064625a8 100644 --- 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 b6e7032ab8..17e3d40152 100644 --- 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 }, |