Skip to content

Commit c25cd39

Browse files
committed
Fix oddity with OSX and Windows.
1 parent c1c1d14 commit c25cd39

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

util/ack/util.c

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ extern int w_flag;
2727
extern int n_error;
2828

2929
#ifdef DEBUG
30-
#define stdout stdout
30+
#define OUTF stdout
3131
#else
32-
#define stdout stderr
32+
#define OUTF stderr
3333
#endif
3434

3535
char* ack_basename(const char* string)
@@ -91,9 +91,9 @@ void fatal(const char* fmt, ...)
9191
/* Fatal internal error */
9292
va_list ap;
9393
va_start(ap, fmt);
94-
fprintf(stdout, "%s: fatal internal error, ", progname);
95-
vfprintf(stdout, fmt, ap);
96-
fprintf(stdout, "\n");
94+
fprintf(OUTF, "%s: fatal internal error, ", progname);
95+
vfprintf(OUTF, fmt, ap);
96+
fprintf(OUTF, "\n");
9797
quit(-2);
9898
}
9999

@@ -103,7 +103,7 @@ void vprint(const char* fmt, ...)
103103
/* Diagnostic print, no auto NL */
104104
va_list ap;
105105
va_start(ap, fmt);
106-
vfprintf(stdout, fmt, ap);
106+
vfprintf(OUTF, fmt, ap);
107107
va_end(ap);
108108
}
109109

@@ -113,9 +113,9 @@ void fuerror(const char* fmt, ...)
113113
/* Fatal user error */
114114
va_list ap;
115115
va_start(ap, fmt);
116-
fprintf(stdout, "%s: ", progname);
117-
vfprintf(stdout, fmt, ap);
118-
fprintf(stdout, "\n");
116+
fprintf(OUTF, "%s: ", progname);
117+
vfprintf(OUTF, fmt, ap);
118+
fprintf(OUTF, "\n");
119119
quit(-1);
120120
}
121121

@@ -127,9 +127,9 @@ void werror(const char* fmt, ...)
127127
if (w_flag)
128128
return;
129129
va_start(ap, fmt);
130-
fprintf(stdout, "%s: warning, ", progname);
131-
vfprintf(stdout, fmt, ap);
132-
fprintf(stdout, "\n");
130+
fprintf(OUTF, "%s: warning, ", progname);
131+
vfprintf(OUTF, fmt, ap);
132+
fprintf(OUTF, "\n");
133133
va_end(ap);
134134
}
135135

@@ -139,9 +139,9 @@ void error(const char* fmt, ...)
139139
/* User error, it is the callers responsibility to quit */
140140
va_list ap;
141141
va_start(ap, fmt);
142-
fprintf(stdout, "%s: ", progname);
143-
vfprintf(stdout, fmt, ap);
144-
fprintf(stdout, "\n");
142+
fprintf(OUTF, "%s: ", progname);
143+
vfprintf(OUTF, fmt, ap);
144+
fprintf(OUTF, "\n");
145145
n_error++;
146146
va_end(ap);
147147
}

0 commit comments

Comments
 (0)