I am sick of that Package: error.

[apt-legacy.git] / cmdline / apt-cdrom.cc

diff --git a/cmdline/apt-cdrom.cc b/cmdline/apt-cdrom.cc
index 677df810e70b6e3f474af77858a7b798de9e5b74..379a433ea3fd000908bd236be7962b790510b8eb 100644 (file)
--- a/cmdline/apt-cdrom.cc
+++ b/cmdline/apt-cdrom.cc
@@ -1,7 +1,3 @@
-extern "C" {
-    #include <mach-o/nlist.h>
-}
-

 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // $Id: apt-cdrom.cc,v 1.45 2003/11/19 23:50:51 mdz Exp $
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // $Id: apt-cdrom.cc,v 1.45 2003/11/19 23:50:51 mdz Exp $


@@ -139,8 +135,8 @@ bool DoIdent(CommandLine &)
 /* */
 int ShowHelp()
 {
 /* */
 int ShowHelp()
 {

-   ioprintf(cout,_("%s %s for %s %s compiled on %s %s\n"),PACKAGE,VERSION,
-           COMMON_OS,COMMON_CPU,__DATE__,__TIME__);
+   ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,VERSION,
+           COMMON_ARCH,__DATE__,__TIME__);

    if (_config->FindB("version") == true)
       return 0;
    
    if (_config->FindB("version") == true)
       return 0;
    


@@ -171,15 +167,6 @@ int ShowHelp()
 
 int main(int argc,const char *argv[])
 {
 
 int main(int argc,const char *argv[])
 {

-#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200
-   struct nlist nl[2];
-   memset(nl, 0, sizeof(nl));
-   nl[0].n_un.n_name = (char *) "_useMDNSResponder";
-   nlist("/usr/lib/libc.dylib", nl);
-   if (nl[0].n_type != N_UNDF)
-       *(int *) nl[0].n_value = 0;
-#endif
-

    CommandLine::Args Args[] = {
       {'h',"help","help",0},
       {'v',"version","version",0},
    CommandLine::Args Args[] = {
       {'h',"help","help",0},
       {'v',"version","version",0},


@@ -201,7 +188,7 @@ int main(int argc,const char *argv[])
 
    // Set up gettext support
    setlocale(LC_ALL,"");
 
    // Set up gettext support
    setlocale(LC_ALL,"");

-   //textdomain(PACKAGE);
+   textdomain(PACKAGE);

 
    // Parse the command line and initialize the package library
    CommandLine CmdL(Args,_config);
 
    // Parse the command line and initialize the package library
    CommandLine CmdL(Args,_config);