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

This commit is contained in:
csmall 2002-06-24 04:29:04 +00:00
parent a81052c692
commit 15ca5a130d
4 changed files with 9 additions and 8 deletions

View File

@ -1,2 +1,3 @@
libproc.so* libproc.so*
*.o *.o
.depend

View File

@ -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. # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation # This Makefile.in is free software; the Free Software Foundation
@ -77,7 +77,7 @@ VERSION = @VERSION@
lib_LTLIBRARIES = libproc.la 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 libproc_la_LDFLAGS = -version-info 3:0:0

View File

@ -5,10 +5,10 @@
* May be distributed under the conditions of the * May be distributed under the conditions of the
* GNU Library General Public License; a copy is in COPYING * GNU Library General Public License; a copy is in COPYING
*/ */
#include "proc/version.h" #include "version.h"
#include "proc/readproc.h" #include "readproc.h"
#include "proc/devname.h" #include "devname.h"
#include "proc/procps.h" #include "procps.h"
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdarg.h> #include <stdarg.h>

View File

@ -16,8 +16,8 @@
#include <unistd.h> #include <unistd.h>
#include <fcntl.h> #include <fcntl.h>
#include "proc/version.h" #include "version.h"
#include "proc/sysinfo.h" /* include self to verify prototypes */ #include "sysinfo.h" /* include self to verify prototypes */
#ifndef HZ #ifndef HZ
#include <netinet/in.h> /* htons */ #include <netinet/in.h> /* htons */