Fix some compilation warning

3 files changed, 7 insertions, 8 deletions

diff --git a/AmlogicCameraHardware.cpp b/AmlogicCameraHardware.cpp
index 9aa112f..213f460 100755
--- a/AmlogicCameraHardware.cpp
+++ b/AmlogicCameraHardware.cpp
@@ -595,13 +595,13 @@ sp<CameraHardwareInterface> AmlogicCameraHardware::createInstance(int CamId)
     if (singleton != 0)

 	{

 		hardware = singleton.promote();

-		#ifdef AMLOGIC_MULTI_CAMERA_SUPPORT

+#ifdef AMLOGIC_MULTI_CAMERA_SUPPORT

 		if(CamId != hardware->getCamId() )

 		{

 			singleton.clear();

 			hardware = NULL;

 		}

-		#endif

+#endif

 	}

 	if(hardware == NULL)

 	{

diff --git a/Android.mk b/Android.mk
index d075b36..6d26c0e 100755
--- a/Android.mk
+++ b/Android.mk
@@ -31,5 +31,4 @@ endif
 #USE FAKECAMERA
 #LOCAL_SRC_FILES += AmlogicCameraHardware.cpp FakeCamera/FakeCamera.cpp
 
-
 include $(BUILD_SHARED_LIBRARY)
diff --git a/V4L2/V4L2Camera.cpp b/V4L2/V4L2Camera.cpp
index 803bc82..966f8fb 100755
--- a/V4L2/V4L2Camera.cpp
+++ b/V4L2/V4L2Camera.cpp
@@ -1,7 +1,7 @@
-#define LOG_NDEBUG 0

-#define NDEBUG 0

-

-#define LOG_TAG "V4L2Camera"

+//#define NDEBUG 0
+#define LOG_TAG "V4L2Camera"
+#define LOG_NDEBUG 0
+
 #include <utils/Log.h>

 #include "V4L2Camera.h"

 #include <linux/videodev2.h>

@@ -19,7 +19,7 @@
 #include <cutils/properties.h>

 #include <sys/time.h>

 #include <unistd.h>

-

+
 extern "C" unsigned char* getExifBuf(char** attrlist, int attrCount, int* exifLen,int thumbnailLen,char* thumbnaildata);

 namespace android {