commit 4d1522bdc7efaa9677ac92b620cea9e9110ec2a4
author Chih-Hung Hsieh <chh@google.com> Tue May 24 11:32:12 2016 -0700
committer Chih-Hung Hsieh <chh@google.com> Tue May 24 11:32:12 2016 -0700
tree e6fbaf33f9204ac58f6ab8195e19666455f09f46
parent cc516cdd0293fead98ed33fa0334c79a940c8653
parent 53529cf975f5247bfa8dfd8bcbaaeb8ceebda3f0

resolve merge conflicts of 53529cf to nyc-dev-plus-aosp

Change-Id: Iae19c31b9ce2d9c604040e54d6fbf125a3d3d362

services/camera/libcameraservice/device1/CameraHardwareInterface.h

diff --git a/services/camera/libcameraservice/device1/CameraHardwareInterface.h b/services/camera/libcameraservice/device1/CameraHardwareInterface.h
index bce0762..0b883ba 100644
--- a/services/camera/libcameraservice/device1/CameraHardwareInterface.h
+++ b/services/camera/libcameraservice/device1/CameraHardwareInterface.h
@@ -606,9 +606,9 @@
                 reinterpret_cast<CameraHardwareInterface *>(user);
         return __this->mPreviewWindow.get();
     }
-#define anw(n) __to_anw(((struct camera_preview_window *)n)->user)
+#define anw(n) __to_anw(((struct camera_preview_window *)(n))->user)
 #define hwi(n) reinterpret_cast<CameraHardwareInterface *>(\
-        ((struct camera_preview_window *)n)->user)
+        ((struct camera_preview_window *)(n))->user)
 
     static int __dequeue_buffer(struct preview_stream_ops* w,
                                 buffer_handle_t** buffer, int *stride)