frame

Merge lp:~chasedouglas/frame/fix-visibility2 into lp:frame

  1. fix-visibility2
  2. Merge into trunk
Proposed by Chase Douglas
Status: Merged
Merged at revision: 73
Proposed branch: lp:~chasedouglas/frame/fix-visibility2
Merge into: lp:frame
Diff against target: 159 lines (+18/-0)
4 files modified
src/v2/device.cpp (+4/-0)
src/v2/event.cpp (+5/-0)
src/v2/frame.cpp (+4/-0)
src/v2/touch.cpp (+5/-0)
To merge this branch: bzr merge lp:~chasedouglas/frame/fix-visibility2
Reviewer Review Type Date Requested Status
Stephen M. Webb (community) Approve
Review via email: mp+98725@code.launchpad.net

Description of the change

Fix symbol visibility for C11 _Generic property getters.

To post a comment you must log in.
Revision history for this message
Stephen M. Webb (bregma) wrote :

Gah, sorry I missed this when reviewing the other visibility patch.

review: Approve
Revision history for this message
Jussi Pakkanen (jpakkane) wrote :

Yes.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/v2/device.cpp'
2--- src/v2/device.cpp 2012-01-30 22:05:12 +0000
3+++ src/v2/device.cpp 2012-03-21 20:32:19 +0000
4@@ -55,6 +55,7 @@
5
6 extern "C" {
7
8+FRAME_PUBLIC
9 UFStatus frame_device_get_property_string_(UFDevice device,
10 UFDeviceProperty property,
11 char **value) {
12@@ -63,6 +64,7 @@
13 value);
14 }
15
16+FRAME_PUBLIC
17 UFStatus frame_device_get_property_int_(UFDevice device,
18 UFDeviceProperty property, int *value) {
19 return static_cast<const utouch::frame::UFDevice*>(device)->GetProperty(
20@@ -70,6 +72,7 @@
21 value);
22 }
23
24+FRAME_PUBLIC
25 UFStatus frame_device_get_property_unsigned_int_(UFDevice device,
26 UFDeviceProperty property,
27 unsigned int *value) {
28@@ -79,6 +82,7 @@
29 }
30
31 #undef frame_device_get_property /* Override C11 generic selections macro */
32+FRAME_PUBLIC
33 UFStatus frame_device_get_property(UFDevice device, UFDeviceProperty property,
34 void *value) {
35 return static_cast<const utouch::frame::UFDevice*>(device)->GetProperty(
36
37=== modified file 'src/v2/event.cpp'
38--- src/v2/event.cpp 2011-12-25 21:28:20 +0000
39+++ src/v2/event.cpp 2012-03-21 20:32:19 +0000
40@@ -79,6 +79,7 @@
41 static_cast<utouch::frame::UFEvent*>(event)->Unref();
42 }
43
44+FRAME_PUBLIC
45 UFStatus frame_event_get_property_type_(UFEvent event, UFEventProperty property,
46 UFEventType *value) {
47 return static_cast<const utouch::frame::UFEvent*>(event)->GetProperty(
48@@ -86,6 +87,7 @@
49 value);
50 }
51
52+FRAME_PUBLIC
53 UFStatus frame_event_get_property_device_(UFEvent event,
54 UFEventProperty property,
55 UFDevice *value) {
56@@ -94,6 +96,7 @@
57 value);
58 }
59
60+FRAME_PUBLIC
61 UFStatus frame_event_get_property_frame_(UFEvent event,
62 UFEventProperty property,
63 UFFrame *value) {
64@@ -102,6 +105,7 @@
65 value);
66 }
67
68+FRAME_PUBLIC
69 UFStatus frame_event_get_property_uint64_(UFEvent event,
70 UFEventProperty property,
71 uint64_t *value) {
72@@ -111,6 +115,7 @@
73 }
74
75 #undef frame_event_get_property /* Override C11 generic selections macro */
76+FRAME_PUBLIC
77 UFStatus frame_event_get_property(UFEvent event, UFEventProperty property,
78 void *value) {
79 return static_cast<const utouch::frame::UFEvent*>(event)->GetProperty(
80
81=== modified file 'src/v2/frame.cpp'
82--- src/v2/frame.cpp 2011-12-25 21:29:09 +0000
83+++ src/v2/frame.cpp 2012-03-21 20:32:19 +0000
84@@ -187,6 +187,7 @@
85
86 extern "C" {
87
88+FRAME_PUBLIC
89 UFStatus frame_frame_get_property_device_(UFFrame frame,
90 UFFrameProperty property,
91 UFDevice *value) {
92@@ -195,6 +196,7 @@
93 return ufframe->GetProperty(property, value);
94 }
95
96+FRAME_PUBLIC
97 UFStatus frame_frame_get_property_uint64_(UFFrame frame,
98 UFFrameProperty property,
99 uint64_t *value) {
100@@ -203,6 +205,7 @@
101 return ufframe->GetProperty(property, value);
102 }
103
104+FRAME_PUBLIC
105 UFStatus frame_frame_get_property_unsigned_int_(UFFrame frame,
106 UFFrameProperty property,
107 unsigned int *value) {
108@@ -212,6 +215,7 @@
109 }
110
111 #undef frame_frame_get_property /* Override C11 generic selections macro */
112+FRAME_PUBLIC
113 UFStatus frame_frame_get_property(UFFrame frame, UFFrameProperty property,
114 void *value) {
115 const utouch::frame::UFFrame* ufframe =
116
117=== modified file 'src/v2/touch.cpp'
118--- src/v2/touch.cpp 2011-12-25 21:28:20 +0000
119+++ src/v2/touch.cpp 2012-03-21 20:32:19 +0000
120@@ -83,6 +83,7 @@
121
122 extern "C" {
123
124+FRAME_PUBLIC
125 UFStatus frame_touch_get_property_uint64_(UFTouch touch,
126 UFTouchProperty property,
127 uint64_t *value) {
128@@ -91,6 +92,7 @@
129 return uftouch->GetProperty(property, value);
130 }
131
132+FRAME_PUBLIC
133 UFStatus frame_touch_get_property_state_(UFTouch touch,
134 UFTouchProperty property,
135 UFTouchState *value) {
136@@ -99,6 +101,7 @@
137 return uftouch->GetProperty(property, value);
138 }
139
140+FRAME_PUBLIC
141 UFStatus frame_touch_get_property_float_(UFTouch touch,
142 UFTouchProperty property,
143 float *value) {
144@@ -107,6 +110,7 @@
145 return uftouch->GetProperty(property, value);
146 }
147
148+FRAME_PUBLIC
149 UFStatus frame_touch_get_property_int_(UFTouch touch, UFTouchProperty property,
150 int *value) {
151 const utouch::frame::UFTouch* uftouch =
152@@ -115,6 +119,7 @@
153 }
154
155 #undef frame_touch_get_property /* Override C11 generic selections macro */
156+FRAME_PUBLIC
157 UFStatus frame_touch_get_property(UFTouch touch, UFTouchProperty property,
158 void* value) {
159 const utouch::frame::UFTouch* uftouch =

Subscribers

People subscribed via source and target branches