diff options
| author | Günther Deschner <gd@samba.org> | 2004-10-04 22:13:57 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 10:52:53 -0500 |
| commit | 2d016a67b87b5fee71fbdd33ea6b6fa78b0c8828 (patch) | |
| tree | 0671c42259b67194536a8948c5090145f44bfdfa | |
| parent | c5ccf8edaf28c2ee208252e43e69a7be168d8eb2 (diff) | |
| download | samba-2d016a67b87b5fee71fbdd33ea6b6fa78b0c8828.tar.gz samba-2d016a67b87b5fee71fbdd33ea6b6fa78b0c8828.tar.bz2 samba-2d016a67b87b5fee71fbdd33ea6b6fa78b0c8828.zip | |
r2821: Adding "Windows x64" as architecture string and driverdir "x64" for the
64bit AMD platform.
(This used to be "Windows AMD64" and "AMD64" in one of the release
candidates of SP2 for Windows XP. AMD64 is obviously still supported but
not documented.)
Guenther
(This used to be commit cc5892f0411b8eb5daebe746164a2cf21d3d4c68)
| -rw-r--r-- | source3/printing/nt_printing.c | 2 | ||||
| -rw-r--r-- | source3/registry/reg_printing.c | 2 | ||||
| -rw-r--r-- | source3/rpc_server/srv_spoolss_nt.c | 1 | ||||
| -rw-r--r-- | source3/rpcclient/cmd_spoolss.c | 1 | ||||
| -rw-r--r-- | source3/utils/net_rpc_printer.c | 3 |
5 files changed, 8 insertions, 1 deletions
diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c index 993fab1419..81d792463a 100644 --- a/source3/printing/nt_printing.c +++ b/source3/printing/nt_printing.c @@ -210,6 +210,7 @@ struct table_node { #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[]= { @@ -219,6 +220,7 @@ static const struct table_node archi_table[]= { {"Windows NT Alpha_AXP", SPL_ARCH_W32ALPHA, 2 }, {"Windows NT PowerPC", SPL_ARCH_W32PPC, 2 }, {"Windows IA64", SPL_ARCH_IA64, 3 }, + {"Windows x64", SPL_ARCH_X64, 3 }, {NULL, "", -1 } }; diff --git a/source3/registry/reg_printing.c b/source3/registry/reg_printing.c index e50a5f4d4f..14eb57c6f2 100644 --- a/source3/registry/reg_printing.c +++ b/source3/registry/reg_printing.c @@ -90,6 +90,8 @@ static int print_subpath_environments( char *key, REGSUBKEY_CTR *subkeys ) "Windows NT R4000", "Windows NT Alpha_AXP", "Windows NT PowerPC", + "Windows IA64", + "Windows x64", NULL }; fstring *drivers = NULL; int i, env_index, num_drivers; diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c index 5c8a6235b6..fb498e73ad 100644 --- a/source3/rpc_server/srv_spoolss_nt.c +++ b/source3/rpc_server/srv_spoolss_nt.c @@ -1995,6 +1995,7 @@ static int get_version_id (char * arch) {"Windows NT Alpha_AXP", "W32ALPHA", 2 }, {"Windows NT PowerPC", "W32PPC", 2 }, {"Windows IA64", "IA64", 3 }, + {"Windows x64", "x64", 3 }, {NULL, "", -1 } }; diff --git a/source3/rpcclient/cmd_spoolss.c b/source3/rpcclient/cmd_spoolss.c index e99cd9f905..a9882d799f 100644 --- a/source3/rpcclient/cmd_spoolss.c +++ b/source3/rpcclient/cmd_spoolss.c @@ -40,6 +40,7 @@ static const struct table_node archi_table[]= { {"Windows NT Alpha_AXP", "W32ALPHA", 2 }, {"Windows NT PowerPC", "W32PPC", 2 }, {"Windows IA64", "IA64", 3 }, + {"Windows x64", "x64", 3 }, {NULL, "", -1 } }; diff --git a/source3/utils/net_rpc_printer.c b/source3/utils/net_rpc_printer.c index 51f4df7b05..732af254d0 100644 --- a/source3/utils/net_rpc_printer.c +++ b/source3/utils/net_rpc_printer.c @@ -35,7 +35,8 @@ static const struct table_node archi_table[]= { {"Windows NT R4000", "W32MIPS", 2 }, {"Windows NT Alpha_AXP", "W32ALPHA", 2 }, {"Windows NT PowerPC", "W32PPC", 2 }, - {"Windows IA64", "IA64", 3 }, + {"Windows IA64", "IA64", 3 }, + {"Windows x64", "x64", 3 }, {NULL, "", -1 } }; |