From: Martin Mares <mj@ucw.cz>
Date: Tue, 14 Jan 2014 11:11:58 +0000 (+0100)
Subject: Merge branch 'master' into dev-opt
X-Git-Tag: v5.99~25^2~32
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=0192d9f3a127c82b32131d26ed9b5fb5a90db723;p=libucw.git

Merge branch 'master' into dev-opt

Conflicts:
	ucw/Makefile
---

0192d9f3a127c82b32131d26ed9b5fb5a90db723
diff --cc ucw/Makefile
index ece9b9a8,f1c171a5..373a8f7f
--- a/ucw/Makefile
+++ b/ucw/Makefile
@@@ -65,7 -64,7 +65,8 @@@ LIBUCW_MAIN_INCLUDES= 
  	resource.h trans.h \
  	daemon.h \
  	signames.h \
 -	sighandler.h
++	sighandler.h \
 +	opt.h
  
  ifdef CONFIG_UCW_THREADS
  # Some modules require threading
@@@ -122,7 -136,7 +139,7 @@@ TESTS+=$(addprefix $(o)/ucw/,regex.tes
      fb-socket.test trie-test.test string.test sha1.test asort-test.test binheap-test.test \
      redblack-test.test fb-file.test fb-grow.test fb-pool.test fb-atomic.test \
      fb-limfd.test fb-temp.test fb-mem.test fb-buffer.test fb-mmap.test fb-multi.test url.test strtonum-test.test \
-     gary.test time.test crc.test signames.test md5.test opt.test)
 -    gary.test time.test crc.test signames.test md5.test bitops.test)
++    gary.test time.test crc.test signames.test md5.test bitops.test opt.test)
  
  $(o)/ucw/varint.test: $(o)/ucw/varint-t
  $(o)/ucw/regex.test: $(o)/ucw/regex-t