From ae7ca4c32cb37ea82e77ad1462fbfcd4d6dfabd3 Mon Sep 17 00:00:00 2001
From: Wu-cheng Li <wuchengli@google.com>
Date: Sat, 15 May 2010 13:05:04 +0800
Subject: Fix build error.

Original name INFINITY conflicts with the macro in math.h.

Change-Id: I9845ed84fca17813dd971239a902cc1e0bad1e3e
---
 include/camera/CameraParameters.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/camera/CameraParameters.h b/include/camera/CameraParameters.h
index 19b052b..20eef72 100644
--- a/include/camera/CameraParameters.h
+++ b/include/camera/CameraParameters.h
@@ -243,7 +243,7 @@ public:
     static const char TRUE[];
 
     // Value for KEY_FOCUS_DISTANCES.
-    static const char INFINITY[];
+    static const char FOCUS_DISTANCE_INFINITY[];
 
     // Values for white balance settings.
     static const char WHITE_BALANCE_AUTO[];
-- 
cgit v1.1