1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
|
require 'formula'
class Owfs < Formula
homepage 'http://owfs.org/'
url 'http://sourceforge.net/projects/owfs/files/owfs/2.9p0/owfs-2.9p0.tar.gz'
version '2.9p0'
sha1 '21b28222e36aca35f62db17e84b0fdf3139aae60'
depends_on 'libusb-compat'
# Fixes inline functions in clang.
# Reported upstream:
# http://sourceforge.net/mailarchive/message.php?msg_id=30219156
def patches
DATA if ENV.compiler == :clang
end
def install
# Fix include of getline and strsep to avoid crash
inreplace 'configure', '-D_POSIX_C_SOURCE=200112L', ''
# 'tac' command is missing in MacOSX
inreplace 'src/man/Makefile.am', 'tac', 'tail -r'
inreplace 'src/man/Makefile.in', 'tac', 'tail -r'
system "./configure", "--disable-debug",
"--disable-dependency-tracking",
"--disable-swig",
"--disable-owfs",
"--disable-owtcl",
"--disable-zero",
"--disable-owpython",
"--disable-owperl",
"--prefix=#{prefix}"
system "make install"
end
test do
system "#{bin}/owserver", "--version"
end
end
__END__
diff --git a/module/owlib/src/include/rwlock.h b/module/owlib/src/include/rwlock.h
index 29246ea..57fce7a 100644
--- a/module/owlib/src/include/rwlock.h
+++ b/module/owlib/src/include/rwlock.h
@@ -26,10 +26,10 @@ typedef struct {
} my_rwlock_t;
void my_rwlock_init(my_rwlock_t * rwlock);
-inline void my_rwlock_write_lock(my_rwlock_t * rwlock);
-inline void my_rwlock_write_unlock(my_rwlock_t * rwlock);
-inline void my_rwlock_read_lock(my_rwlock_t * rwlock);
-inline void my_rwlock_read_unlock(my_rwlock_t * rwlock);
+void my_rwlock_write_lock(my_rwlock_t * rwlock);
+void my_rwlock_write_unlock(my_rwlock_t * rwlock);
+void my_rwlock_read_lock(my_rwlock_t * rwlock);
+void my_rwlock_read_unlock(my_rwlock_t * rwlock);
void my_rwlock_destroy(my_rwlock_t * rwlock);
#else /* not OW_MT */
diff --git a/module/ownet/c/src/include/rwlock.h b/module/ownet/c/src/include/rwlock.h
index 28fc598..c5e6188 100644
--- a/module/ownet/c/src/include/rwlock.h
+++ b/module/ownet/c/src/include/rwlock.h
@@ -26,10 +26,10 @@ typedef struct {
} my_rwlock_t;
void my_rwlock_init(my_rwlock_t * rwlock);
-inline void my_rwlock_write_lock(my_rwlock_t * rwlock);
-inline void my_rwlock_write_unlock(my_rwlock_t * rwlock);
-inline void my_rwlock_read_lock(my_rwlock_t * rwlock);
-inline void my_rwlock_read_unlock(my_rwlock_t * rwlock);
+void my_rwlock_write_lock(my_rwlock_t * rwlock);
+void my_rwlock_write_unlock(my_rwlock_t * rwlock);
+void my_rwlock_read_lock(my_rwlock_t * rwlock);
+void my_rwlock_read_unlock(my_rwlock_t * rwlock);
void my_rwlock_destroy(my_rwlock_t * rwlock);
#endif /* OW_MT */
|
