Merge commit 'refs/merge-requests/10' of git://gitorious.org/procps/procps into merge-requests/10

2013-04-07 17:58:06 +10:00
parent 526bc5dfa9 838e5d8941
commit 293b668d5f
15 changed files with 73 additions and 6 deletions
--- a/pmap.c
+++ b/pmap.c
@ -1012,7 +1012,9 @@ int main(int argc, char **argv)
 		{NULL, 0, NULL, 0}
 	};

+#ifdef HAVE_PROGRAM_INVOCATION_NAME
 	program_invocation_name = program_invocation_short_name;
+#endif
 	nls_initialize();
 	atexit(close_stdout);