Changes in / [1a5fe4f:ef4218f] in mainline

Files:

• kernel/generic/src/security/perm.c (modified) (1 diff)
• tools/xcw/bin/helenos-bld-config (modified) (1 diff)
• tools/xcw/bin/helenos-ld (deleted)
• tools/xcw/demo/Makefile (modified) (2 diffs)
• uspace/lib/c/Makefile (modified) (1 diff)
• uspace/lib/c/include/string.h (modified) (1 diff)
• uspace/lib/c/test/main.c (modified) (1 diff)
• uspace/lib/c/test/perm.c (deleted)

kernel/generic/src/security/perm.c

@@ -131 +131 @@
          * doesn't have PERM_PERM.
          */
-        irq_spinlock_lock(&TASK->lock, false);
+        irq_spinlock_unlock(&TASK->lock, false);
 
         if ((!(TASK->perms & PERM_PERM)) || (task != TASK)) {

tools/xcw/bin/helenos-bld-config

@@ -47 +47 @@
 case ".$1" in
 (.--cc) extract_field "CC" "$MAKEFILE_COMMON";;
-(.--ld) extract_field "LD" "$MAKEFILE_COMMON";;
 (.--uarch) extract_field "UARCH" "$MAKEFILE_CONFIG";;
 (.--endian)

tools/xcw/demo/Makefile

@@ -43 +43 @@
 
 CC = helenos-cc
-LD = helenos-ld
-CFLAGS = -std=gnu11 -Wall `helenos-pkg-config --cflags libgui libdraw libmath` \
-    -D_HELENOS_SOURCE
+CFLAGS = -std=gnu99 -Wall `helenos-pkg-config --cflags libgui libdraw libmath`
 LIBS = `helenos-pkg-config --libs libgui libdraw libmath`
 output = viewer
@@ -57 +55 @@
 
 $(output): $(objects)
-        $(LD) -o $@ $^ $(LIBS)
+        $(CC) -o $@ $^ $(LIBS)
 
 %.o: %.c

uspace/lib/c/Makefile

@@ -194 +194 @@
         test/stdio/scanf.c \
         test/odict.c \
-        test/perm.c \
         test/qsort.c \
         test/sprintf.c \

uspace/lib/c/include/string.h

@@ -36 +36 @@
 #define LIBC_STRING_H_
 
-#if defined(_HELENOS_SOURCE) && !defined(_REALLY_WANT_STRING_H)
+#ifdef _HELENOS_SOURCE
 #error Please use str.h and mem.h instead
 #endif

uspace/lib/c/test/main.c

@@ -37 +37 @@
 PCUT_IMPORT(mem);
 PCUT_IMPORT(odict);
-PCUT_IMPORT(perm);
 PCUT_IMPORT(qsort);
 PCUT_IMPORT(scanf);