projects
/
oweals
/
busybox.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b5c60fc
)
microcom: undo #define trick, gcc fails to take advantage of it
author
Denis Vlasenko
<vda.linux@googlemail.com>
Mon, 28 Jan 2008 09:39:30 +0000
(09:39 -0000)
committer
Denis Vlasenko
<vda.linux@googlemail.com>
Mon, 28 Jan 2008 09:39:30 +0000
(09:39 -0000)
miscutils/microcom.c
patch
|
blob
|
history
diff --git
a/miscutils/microcom.c
b/miscutils/microcom.c
index 160bff19b2120b0a07fe0131b78a17838ba63b9c..00a49837ea65feca0b1dab9c1074b8553b3ab6bc 100644
(file)
--- a/
miscutils/microcom.c
+++ b/
miscutils/microcom.c
@@
-45,8
+45,8
@@
int microcom_main(int argc, char **argv)
{
struct pollfd pfd[2];
int nfd;
-
//
int sfd;
-#define sfd (pfd[0].fd)
+ int sfd;
+/* #define sfd (pfd[0].fd) - gcc 4.2.1 is still not smart enough */
char *device_lock_file;
const char *opt_s = "9600";
speed_t speed;
@@
-123,7
+123,7
@@
int microcom_main(int argc, char **argv)
goto restore0_close_unlock_and_exit;
// main loop: check with poll(), then read/write bytes across
- /* pfd[0].fd = sfd; - they are the same */
+ pfd[0].fd = sfd;
pfd[0].events = POLLIN;
pfd[1].fd = STDIN_FILENO;
pfd[1].events = POLLIN;