Changeset 0dc2fec in mainline for uspace/app

Timestamp:

2016-05-22T19:19:43Z (10 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

b272c67a

Parents:

153c7a29 (diff), af2254ec (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 mainline changes

Location:

uspace/app

Files:

• barber/Makefile (modified) (1 diff)
• rcubench/Makefile (modified) (1 diff)
• rcutest/Makefile (modified) (1 diff)
• sbi/src/bigint.c (modified) (1 diff)
• tetris/tetris.c (modified) (1 diff)

uspace/app/barber/Makefile

@@ -85 +85 @@
 include $(USPACE_PREFIX)/Makefile.common
 
-images.c images.h: $(IMAGES)
-        $(ROOT_PATH)/tools/mkarray.py images COMPOSITOR_IMAGES $^
+image%.c image%.h: $(IMAGES)
+        $(ROOT_PATH)/tools/mkarray.py images COMPOSITOR_IMAGES $(IMAGES)

uspace/app/rcubench/Makefile

@@ -29 +29 @@
 USPACE_PREFIX = ../..
 
-LIBS = $(LIBURCU_PREFIX)/liburcu.a
-
-EXTRA_CFLAGS += -I$(LIBURCU_PREFIX)
-        
 BINARY = rcubench
 

uspace/app/rcutest/Makefile

@@ -29 +29 @@
 USPACE_PREFIX = ../..
 
-LIBS = $(LIBURCU_PREFIX)/liburcu.a
-
-EXTRA_CFLAGS += -I$(LIBURCU_PREFIX)
-        
 BINARY = rcutest
 

uspace/app/sbi/src/bigint.c

@@ -379 +379 @@
         printf("Convert bigint to string.\n");
 #endif
-        assert(BIGINT_BASE >= 10);
+        static_assert(BIGINT_BASE >= 10);
 
         /* Compute number of characters. */

uspace/app/tetris/tetris.c

@@ -51 +51 @@
  */
 
-static const char copyright[] =
+static volatile const char copyright[] =
         "@(#) Copyright (c) 1992, 1993\n"
         "\tThe Regents of the University of California.  All rights reserved.\n";