Merge branch 'master', remote-tracking branch 'sami/ng'

This commit is contained in:
Craig Small
2011-10-01 23:23:30 +10:00
43 changed files with 452 additions and 578 deletions

View File

@@ -1,4 +1,4 @@
/* Suite version information for procps utilities
/* Suite version information for procps-ng utilities
* Copyright (c) 1995 Martin Schulze <joey@infodrom.north.de>
* Ammended by cblake to only export the function symbol.
*
@@ -7,24 +7,18 @@
* Redistributable under the terms of the
* GNU Library General Public License; see COPYING
*/
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include <stdio.h>
#include <stdlib.h>
#include "version.h"
#ifdef MINORVERSION
const char procps_version[] = "procps version " VERSION "." SUBVERSION "." MINORVERSION;
#else
const char procps_version[] = "procps version " VERSION "." SUBVERSION;
#endif
const char procps_version[] = PACKAGE_NAME " version " PACKAGE_VERSION;
void display_version(void) {
fprintf(stdout, "%s\n", procps_version);
}
/* Linux kernel version information for procps utilities
/* Linux kernel version information for procps-ng utilities
* Copyright (c) 1996 Charles Blake <cblake@bbn.com>
*/
#include <sys/utsname.h>