Upgraded to APT 0.7.

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

diff --git a/cmdline/apt-cdrom.cc b/cmdline/apt-cdrom.cc
index 1585694dae001d95449b8a52c10ea9f53b9f0b98..8e49234fe720794304c0350566517c7ef0edc307 100644 (file)
--- a/cmdline/apt-cdrom.cc
+++ b/cmdline/apt-cdrom.cc
@@ -135,8 +135,8 @@ bool DoIdent(CommandLine &)
 /* */
 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;
    
@@ -165,11 +165,7 @@ int ShowHelp()
 }
                                                                        /*}}}*/
 
-int main_(int argc,const char *argv[]);
-int main(int argc,const char *argv[]) {
-    _exit(main_(argc, argv));
-}
-int main_(int argc,const char *argv[])
+int main(int argc,const char *argv[])
 {
    CommandLine::Args Args[] = {
       {'h',"help","help",0},