[cogl] Revert "Add compatibility API for functions removed after 1.9.8"

[Neil Roberts <nroberts src gnome org>]

commit ac927ed5c85bdef82be25905b2ccdb4790a64e49
Author: Neil Roberts <neil linux intel com>
Date:   Mon Apr 16 12:10:14 2012 +0100

    Revert "Add compatibility API for functions removed after 1.9.8"
    
    This reverts commit 361bd516f3d678d6d8ec08c1f01cf872e10a4f43.
    
    This patch was only added to provide compatibility with the 1.9.8
    release after an API cleanup removed some redundant experimental
    symbols. This is no longer needed because the master branch is now
    able to break API again.
    
    I've also removed some later changes that were added to reflect the
    patch in the MSVC project files.
    
    Conflicts:
    
    	cogl/Makefile.am
    
    Reviewed-by: Robert Bragg <robert linux intel com>

 build/win32/vs10/cogl.props  |    2 -
 build/win32/vs9/cogl.vsprops |    1 -
 cogl/Makefile.am             |    2 -
 cogl/cogl.h                  |    2 -
 cogl/cogl2-compatibility.c   |  148 ------------------------------------------
 cogl/cogl2-compatibility.h   |   55 ----------------
 6 files changed, 0 insertions(+), 210 deletions(-)
---
diff --git a/build/win32/vs10/cogl.props b/build/win32/vs10/cogl.props
index df727be..7dccf72 100644
--- a/build/win32/vs10/cogl.props
+++ b/build/win32/vs10/cogl.props
@@ -183,8 +183,6 @@ copy ..\..\..\cogl\cogl2-path.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
 
 copy ..\..\..\cogl\cogl2-experimental.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
 
-copy ..\..\..\cogl\cogl2-compatibility.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
-
 </CoglDoInstall>
     <GenerateCoglDef>
          echo EXPORTS &gt; ..\..\..\cogl\cogl.def
diff --git a/build/win32/vs9/cogl.vsprops b/build/win32/vs9/cogl.vsprops
index 4c88f33..a42c4d7 100644
--- a/build/win32/vs9/cogl.vsprops
+++ b/build/win32/vs9/cogl.vsprops
@@ -170,7 +170,6 @@ copy ..\..\..\cogl\cogl-win32-renderer.h $(OutDir)\include\cogl-$(CoglApiVersion
 copy ..\..\..\cogl\cogl1-context.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl&#x0D;&#x0A;
 copy ..\..\..\cogl\cogl2-path.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl&#x0D;&#x0A;
 copy ..\..\..\cogl\cogl2-experimental.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl&#x0D;&#x0A;
-copy ..\..\..\cogl\cogl2-compatibility.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl&#x0D;&#x0A;
 
 mkdir $(OutDir)\share\cogl-$(CoglApiVersion)\tests&#x0D;&#x0A;
 copy ..\..\..\tests\data\valgrind.suppressions $(OutDir)\share\cogl-$(CoglApiVersion)\tests&#x0D;&#x0A;
diff --git a/cogl/Makefile.am b/cogl/Makefile.am
index 02edaa4..16e7005 100644
--- a/cogl/Makefile.am
+++ b/cogl/Makefile.am
@@ -99,7 +99,6 @@ cogl_experimental_h = \
 	$(srcdir)/cogl-depth-state.h 		\
 	$(srcdir)/cogl-buffer.h 		\
 	$(srcdir)/cogl-pixel-buffer.h		\
-	$(srcdir)/cogl2-compatibility.h		\
 	$(NULL)
 
 # driver sources
@@ -210,7 +209,6 @@ cogl_sources_c = \
 	$(srcdir)/cogl-clip-state-private.h		\
 	$(srcdir)/cogl-clip-state.h			\
 	$(srcdir)/cogl-clip-state.c			\
-	$(srcdir)/cogl2-compatibility.c			\
 	$(srcdir)/cogl-feature-private.h                \
 	$(srcdir)/cogl-feature-private.c                \
 	$(srcdir)/cogl-color-private.h    		\
diff --git a/cogl/cogl.h b/cogl/cogl.h
index 6a8e10b..baacd8a 100644
--- a/cogl/cogl.h
+++ b/cogl/cogl.h
@@ -127,8 +127,6 @@
  */
 #ifdef COGL_ENABLE_EXPERIMENTAL_2_0_API
 #include <cogl/cogl2-path.h>
-/* This header will be removed in Cogl 1.12 */
-#include <cogl/cogl2-compatibility.h>
 #endif
 
 /*