From cabddaeb4f504be5d078ac975121ef78cd02aa42 Mon Sep 17 00:00:00 2001
From: Andrey Kamaev <andrey.kamaev@itseez.com>
Date: Wed, 10 Oct 2012 13:17:37 +0400
Subject: [PATCH] Revert "Issue #2035 Calling cv::namedWindow crashes on
 Android fixed."

This reverts commit 36135fc59d59f1ebfce4b00bb36ce6edfbcd9018.
---
 modules/highgui/CMakeLists.txt                      | 2 --
 modules/highgui/include/opencv2/highgui/highgui.hpp | 3 ---
 2 files changed, 5 deletions(-)

diff --git a/modules/highgui/CMakeLists.txt b/modules/highgui/CMakeLists.txt
index 86ad1c79e4..30c0c82f4d 100644
--- a/modules/highgui/CMakeLists.txt
+++ b/modules/highgui/CMakeLists.txt
@@ -70,8 +70,6 @@ set(highgui_srcs
 
 file(GLOB highgui_ext_hdrs "include/opencv2/${name}/*.hpp" "include/opencv2/${name}/*.h")
 
-add_definitions(-DHAVE_ANDROID_UI)
-
 if(HAVE_QT)
   if (HAVE_QT_OPENGL)
     set(QT_USE_QTOPENGL TRUE)
diff --git a/modules/highgui/include/opencv2/highgui/highgui.hpp b/modules/highgui/include/opencv2/highgui/highgui.hpp
index 59be1358fe..c511beb955 100644
--- a/modules/highgui/include/opencv2/highgui/highgui.hpp
+++ b/modules/highgui/include/opencv2/highgui/highgui.hpp
@@ -54,7 +54,6 @@ struct CvVideoWriter;
 namespace cv
 {
 
-#if defined(ANDROID) && defined(HAVE_ANDROID_UI)
 enum { 
     // Flags for namedWindow
     WINDOW_NORMAL   = CV_WINDOW_NORMAL,   // the user can resize the window (no constraint) / also use to switch a fullscreen window to a normal size
@@ -156,8 +155,6 @@ CV_EXPORTS int createButton( const string& bar_name, ButtonCallback on_change,
                              void* userdata=NULL, int type=CV_PUSH_BUTTON,
                              bool initial_button_state=0);
 
-#endif
-
 //-------------------------
 
 enum