Adjusted includes so no longer a clash with old and new includes

diff --git a/proc/.cvsignore b/proc/.cvsignore
index a83d75f84ffced5fbebf0216433b6805b94a5a5d..190833310149c5670e5978e111aebfb78718112a 100644 (file)
--- a/proc/.cvsignore
+++ b/proc/.cvsignore
@@ -1,2 +1,3 @@
 libproc.so*
 *.o
+.depend

diff --git a/proc/Makefile.in b/proc/Makefile.in
index c8f8de6a1da301e9c7b1572c28e2b72f42df14f6..94d04ca50d4cafd4b111630355c05e375b03ca3e 100644 (file)
--- a/proc/Makefile.in
+++ b/proc/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
 
 # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
@@ -77,7 +77,7 @@ VERSION = @VERSION@
 
 lib_LTLIBRARIES = libproc.la
 
-libproc_la_SOURCES = alloc.c compare.c compare.h devname.c devname.h                      ksym.c output.c procps.h pwcache.c readproc.c                                         readproc.h sig.c sig.h status.c status.h sysinfo.c                                      sysinfo.h tree.h version.c version.h whattime.c                                         whattime.h
+libproc_la_SOURCES = alloc.c compare.c compare.h devname.c devname.h                      ksym.c output.c procps.h pwcache.c readproc.c                                         readproc.h sig.c sig.h status.c status.h sysinfo.c                                      sysinfo.h version.c version.h whattime.c                                        whattime.h
 
 
 libproc_la_LDFLAGS = -version-info 3:0:0

diff --git a/proc/readproc.c b/proc/readproc.c
index 4f05e9654f7aeacbbd6e96b229fb72554672eb02..0e547782eea3972f05fb4dd5117036968f887176 100644 (file)
--- a/proc/readproc.c
+++ b/proc/readproc.c
@@ -5,10 +5,10 @@
  * May be distributed under the conditions of the
  * GNU Library General Public License; a copy is in COPYING
  */
-#include "proc/version.h"
-#include "proc/readproc.h"
-#include "proc/devname.h"
-#include "proc/procps.h"
+#include "version.h"
+#include "readproc.h"
+#include "devname.h"
+#include "procps.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>

diff --git a/proc/sysinfo.c b/proc/sysinfo.c
index 3954320f69a47df9d7bbfd6dfa56e975daa6dcfc..972383f33b5b94b9c334492dc2f2c77701588dec 100644 (file)
--- a/proc/sysinfo.c
+++ b/proc/sysinfo.c
@@ -16,8 +16,8 @@
 
 #include <unistd.h>
 #include <fcntl.h>
-#include "proc/version.h"
-#include "proc/sysinfo.h" /* include self to verify prototypes */
+#include "version.h"
+#include "sysinfo.h" /* include self to verify prototypes */
 
 #ifndef HZ
 #include <netinet/in.h>  /* htons */