Removed the API changes to preserve SDL 1.2 stability

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%40297

include/Makefile.am

@@ -18,7 +18,6 @@ libSDLinclude_HEADERS =		\
 	SDL_joystick.h		\
 	SDL_keyboard.h		\
 	SDL_keysym.h		\
-	SDL_loadso.h		\
 	SDL_main.h		\
 	SDL_mouse.h		\
 	SDL_mutex.h		\

include/SDL.h

@@ -34,7 +34,6 @@ static char rcsid =
 #include "SDL_types.h"
 #include "SDL_getenv.h"
 #include "SDL_error.h"
-#include "SDL_loadso.h"
 #include "SDL_rwops.h"
 #include "SDL_timer.h"
 #include "SDL_audio.h"

include/SDL_loadso.h

@@ -1,61 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997, 1998, 1999, 2000, 2001  Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Library General Public License for more details.
-
-    You should have received a copy of the GNU Library General Public
-    License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-#ifdef SAVE_RCSID
-static char rcsid =
- "@(#) $Id$";
-#endif
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-/* System dependent library loading routines                           */
-
-#ifndef _SDL_loadso_h
-#define _SDL_loadso_h
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* This function dynamically loads a shared object and returns a pointer
- * to the object handle (or NULL if there was an error).
- * The 'sofile' parameter is a system dependent name of the object file.
- */
-extern DECLSPEC void *SDL_LoadObject(const char *sofile);
-
-/* Given an object handle, this function looks up the address of the
- * named function in the shared object and returns it.  This address
- * is no longer valid after calling SDL_UnloadObject().
- */
-extern DECLSPEC void *SDL_LoadFunction(void *handle, const char *name);
-
-/* Unload a shared object from memory */
-extern DECLSPEC void SDL_UnloadObject(void *handle);
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_loadso_h */

include/SDL_video.h

@@ -531,26 +531,6 @@ extern DECLSPEC void SDL_FreeSurface(SDL_Surface *surface);
 extern DECLSPEC int SDL_LockSurface(SDL_Surface *surface);
 extern DECLSPEC void SDL_UnlockSurface(SDL_Surface *surface);
 
-/*
- * SDL_LockRect() locks a portion of the surface designated by the 'rect'
- * parameter, and saves the resulting pixels and pitch in the arguments.
- * The rect will be clipped if it extends beyond the bounds of the surface
- *
- * This may be more efficient than a full lock if you are using a hardware
- * surface and plan to make a few changes to small areas in the surface.
- *
- * While a rectangle is locked, no other lock or blit call may be called
- * on the surface.  No operating system or library calls should be made
- * between lock/unlock pairs, as critical system locks may be held during
- * this time.
- *
- * After the surface is unlocked, the pixels pointer is no longer valid.
- *
- * SDL_LockRect() returns 0, or -1 if the surface couldn't be locked.
- */
-extern DECLSPEC int SDL_LockRect(SDL_Surface *surface, SDL_Rect *rect, void **pixels, int *pitch);
-extern DECLSPEC void SDL_UnlockRect(SDL_Surface *surface);
-
 /*
  * Load a surface from a seekable SDL data source (memory or file.)
  * If 'freesrc' is non-zero, the source will be closed after being read.