aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMelissa O'Neill <oneill@cs.sfu.ca>1998-11-23 02:20:35 -0700
committerJeff Law <law@gcc.gnu.org>1998-11-23 02:20:35 -0700
commit9855b854a4009b4327e16df8a2cdde69f2b05ba2 (patch)
tree6ae61120842874d485414bd0eadf91cc13254ade
parent83cbe7e48dee1d426546dc84e13ea057ac0e722c (diff)
downloadgcc-9855b854a4009b4327e16df8a2cdde69f2b05ba2.zip
gcc-9855b854a4009b4327e16df8a2cdde69f2b05ba2.tar.gz
gcc-9855b854a4009b4327e16df8a2cdde69f2b05ba2.tar.bz2
cccp.c (S_ISREG, S_ISDIR): Delete defines.
* cccp.c (S_ISREG, S_ISDIR): Delete defines. * cpplib.c, gcc.c: Likewise. * system.h (S_ISREG, S_ISDIR): Define if not already defined. From-SVN: r23785
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/cccp.c8
-rw-r--r--gcc/cpplib.c8
-rw-r--r--gcc/gcc.c10
-rw-r--r--gcc/system.h11
5 files changed, 17 insertions, 26 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c5635ed..59e68b2 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+Mon Nov 23 10:16:38 1998 "Melissa O'Neill" <oneill@cs.sfu.ca>
+
+ * cccp.c (S_ISREG, S_ISDIR): Delete defines.
+ * cpplib.c, gcc.c: Likewise.
+ * system.h (S_ISREG, S_ISDIR): Define if not already defined.
+
Mon Nov 23 09:53:44 1998 Richard Henderson <rth@cygnus.com>
* local-alloc.c (local_alloc): Use malloc not alloca for
diff --git a/gcc/cccp.c b/gcc/cccp.c
index 0d55cec..d6b2aa0 100644
--- a/gcc/cccp.c
+++ b/gcc/cccp.c
@@ -113,14 +113,6 @@ static int hack_vms_include_specification ();
# endif
#endif
-#ifndef S_ISREG
-#define S_ISREG(m) (((m) & S_IFMT) == S_IFREG)
-#endif
-
-#ifndef S_ISDIR
-#define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
-#endif
-
#ifndef INO_T_EQ
#define INO_T_EQ(a, b) ((a) == (b))
#endif
diff --git a/gcc/cpplib.c b/gcc/cpplib.c
index f8a38e5..269ac66 100644
--- a/gcc/cpplib.c
+++ b/gcc/cpplib.c
@@ -72,14 +72,6 @@ extern char *update_path PARAMS ((char *, char *));
# endif
#endif
-#ifndef S_ISREG
-#define S_ISREG(m) (((m) & S_IFMT) == S_IFREG)
-#endif
-
-#ifndef S_ISDIR
-#define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
-#endif
-
/* By default, colon separates directories in a path. */
#ifndef PATH_SEPARATOR
#define PATH_SEPARATOR ':'
diff --git a/gcc/gcc.c b/gcc/gcc.c
index 77b9060..2704d96 100644
--- a/gcc/gcc.c
+++ b/gcc/gcc.c
@@ -55,16 +55,6 @@ extern void set_std_prefix PROTO((char *, int));
#define exit __posix_exit
#endif
-/* Test if something is a normal file. */
-#ifndef S_ISREG
-#define S_ISREG(m) (((m) & S_IFMT) == S_IFREG)
-#endif
-
-/* Test if something is a directory. */
-#ifndef S_ISDIR
-#define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
-#endif
-
/* By default there is no special suffix for executables. */
#ifdef EXECUTABLE_SUFFIX
#define HAVE_EXECUTABLE_SUFFIX
diff --git a/gcc/system.h b/gcc/system.h
index f876c54..bb5d680 100644
--- a/gcc/system.h
+++ b/gcc/system.h
@@ -356,4 +356,15 @@ extern void abort ();
#define _(String) String
#define N_(String) String
+
+/* Test if something is a normal file. */
+#ifndef S_ISREG
+#define S_ISREG(m) (((m) & S_IFMT) == S_IFREG)
+#endif
+
+/* Test if something is a directory. */
+#ifndef S_ISDIR
+#define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
+#endif
+
#endif /* __GCC_SYSTEM_H__ */