Changeset 2e08dce in mainline

Timestamp:

2011-04-09T18:39:10Z (13 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

7ab6fc2

Parents:

3baec29

Message:

cpp: minor changes and added binary to the iso image

Files:

• boot/Makefile.common (modified) (1 diff)
• uspace/app/pcc/cc/cpp/Makefile (modified) (1 diff)
• uspace/app/pcc/cc/cpp/cpp.c (modified) (1 diff)
• uspace/app/pcc/cc/cpp/token.c (modified) (1 diff)

boot/Makefile.common

@@ -124 +124 @@
 
 RD_APPS_NON_ESSENTIAL = \
+        $(USPACE_PATH)/app/cpp/cpp \
         $(USPACE_PATH)/app/edit/edit \
         $(USPACE_PATH)/app/kill/kill \

uspace/app/pcc/cc/cpp/Makefile

@@ -37 +37 @@
 EXTRA_CFLAGS = -I$(LIBCOMPAT_PREFIX) -I$(MIPDIR) -I$(ARCHDIR)
 EXTRA_CLEAN = y.tab.c y.tab.h
-DEFS = -DCPP_DEBUG -Dfree=free
+DEFS = -DCPP_DEBUG -Dfree=free -DCPPBUF=16384
 BINARY = cpp
 

uspace/app/pcc/cc/cpp/cpp.c

@@ -275 +275 @@
                         error("Can't creat %s", argv[1]);
         } else
-                ofd = 1; /* stdout */
+                ofd = fileno(stdout);
         istty = isatty(ofd);
 

uspace/app/pcc/cc/cpp/token.c

@@ -800 +800 @@
                         error("Limit for nested includes exceeded");
         } else {
-                ic->infil = 0;
+                error("Reading from stdin is disabled on HelenOS.");
+                ic->infil = fileno(stdin);
                 ic->orgfn = ic->fname = (const usch *)"<stdin>";
         }