Changeset 3b10ae36 in mainline

Timestamp:

2018-08-02T14:14:14Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

0c27956

Parents:

82d9087 (diff), 42964a7 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge SIF.

Files:

• .gitignore (modified) (2 diffs)
• boot/Makefile.common (modified) (2 diffs)
• uspace/Makefile (modified) (2 diffs)
• uspace/app/contacts/Makefile (added)
• uspace/app/contacts/contacts.c (added)
• uspace/lib/c/include/stdio.h (modified) (1 diff)
• uspace/lib/sif/Makefile (added)
• uspace/lib/sif/include/sif.h (added)
• uspace/lib/sif/private/sif.h (added)
• uspace/lib/sif/src/sif.c (added)
• uspace/lib/sif/test/main.c (added)
• uspace/lib/sif/test/sif.c (added)

.gitignore

@@ -82 +82 @@
 uspace/app/blkdump/blkdump
 uspace/app/bnchmark/bnchmark
+uspace/app/contacts/contacts
 uspace/app/corecfg/corecfg
 uspace/app/cpptest/cpptest
@@ -380 +381 @@
 uspace/lib/posix/redefs-hide-libc-symbols.list
 uspace/lib/posix/test-libposix
+uspace/lib/sif/test-libsif
 uspace/lib/uri/test-liburi
 uspace/srv/audio/hound/hound

boot/Makefile.common

@@ -176 +176 @@
         $(USPACE_PATH)/app/blkdump/blkdump \
         $(USPACE_PATH)/app/bnchmark/bnchmark \
+        $(USPACE_PATH)/app/contacts/contacts \
         $(USPACE_PATH)/app/corecfg/corecfg \
         $(USPACE_PATH)/app/cpptest/cpptest \
@@ -240 +241 @@
         $(USPACE_PATH)/lib/label/test-liblabel \
         $(USPACE_PATH)/lib/posix/test-libposix \
+        $(USPACE_PATH)/lib/sif/test-libsif \
         $(USPACE_PATH)/lib/uri/test-liburi \
         $(USPACE_PATH)/drv/bus/usb/xhci/test-xhci \

uspace/Makefile

@@ -39 +39 @@
         app/blkdump \
         app/bnchmark \
+        app/contacts \
         app/corecfg \
         app/cpptest \
@@ -229 +230 @@
         lib/fmtutil \
         lib/scsi \
+        lib/sif \
         lib/compress \
         lib/drv \

uspace/lib/c/include/stdio.h

@@ -178 +178 @@
 
 extern FILE *tmpfile(void);
-extern char *tmpnam(char *s) __attribute__((deprecated));
+extern char *tmpnam(char *s);
 
 #ifdef _HELENOS_SOURCE