summaryrefslogtreecommitdiffstats
path: root/cpukit/libmisc
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2011-01-17 23:05:36 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2011-01-17 23:05:36 +0000
commit2946682d5956d448ac98860d1298ad804f6c7f94 (patch)
tree6b9c6da804d7b4c10d374307ed10fa0759604531 /cpukit/libmisc
parent2011-01-17 Alin Rus <alin.codejunkie@gmail.com> (diff)
downloadrtems-2946682d5956d448ac98860d1298ad804f6c7f94.tar.bz2
2011-01-17 Joel Sherrill <joel.sherrill@oarcorp.com>
* libmisc/shell/main_dd.c: Make symbol unique to avoid conflict with same name in <sys/stat.h>.
Diffstat (limited to 'cpukit/libmisc')
-rw-r--r--cpukit/libmisc/shell/main_dd.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/cpukit/libmisc/shell/main_dd.c b/cpukit/libmisc/shell/main_dd.c
index eabb23efd6..930d382a97 100644
--- a/cpukit/libmisc/shell/main_dd.c
+++ b/cpukit/libmisc/shell/main_dd.c
@@ -76,7 +76,7 @@ __FBSDID("$FreeBSD: src/bin/dd/dd.c,v 1.43 2004/08/15 19:10:05 rwatson Exp $");
#include "dd.h"
#include "extern-dd.h"
-#define DEFFILEMODE 0
+#define DD_DEFFILEMODE 0
static void dd_close(rtems_shell_dd_globals* globals);
static void dd_in(rtems_shell_dd_globals* globals);
@@ -194,14 +194,14 @@ setup(rtems_shell_dd_globals* globals)
} else {
#define OFLAGS \
(O_CREAT | (ddflags & (C_SEEK | C_NOTRUNC) ? 0 : O_TRUNC))
- out.fd = open(out.name, O_RDWR | OFLAGS, DEFFILEMODE);
+ out.fd = open(out.name, O_RDWR | OFLAGS, DD_DEFFILEMODE);
/*
* May not have read access, so try again with write only.
* Without read we may have a problem if output also does
* not support seeks.
*/
if (out.fd == -1) {
- out.fd = open(out.name, O_WRONLY | OFLAGS, DEFFILEMODE);
+ out.fd = open(out.name, O_WRONLY | OFLAGS, DD_DEFFILEMODE);
out.flags |= NOREAD;
}
if (out.fd == -1)