diff options
| author | Marcus Meissner <marcus@jet.franken.de> | 2007-12-29 22:28:06 +0000 |
|---|---|---|
| committer | Marcus Meissner <marcus@jet.franken.de> | 2007-12-29 22:28:06 +0000 |
| commit | a9c2caa5fe71bca1ba31ec1b6305473a0b2ab320 (patch) | |
| tree | a38ff234de72802f0ed5e40c0029bbe91364dc26 /libgphoto2_port/libgphoto2_port | |
| parent | ed655e49b8c3acacbf90298205dcfc0af549401c (diff) | |
| download | libgphoto2-a9c2caa5fe71bca1ba31ec1b6305473a0b2ab320.tar.gz | |
restructured symbol versions a bit, fixed includes
to seperate
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@10910 67ed7778-7388-44ab-90cf-0a291f65f57c
Diffstat (limited to 'libgphoto2_port/libgphoto2_port')
| -rw-r--r-- | libgphoto2_port/libgphoto2_port/gphoto2-port-info-list.c | 9 | ||||
| -rw-r--r-- | libgphoto2_port/libgphoto2_port/gphoto2-port.c | 8 |
2 files changed, 1 insertions, 16 deletions
diff --git a/libgphoto2_port/libgphoto2_port/gphoto2-port-info-list.c b/libgphoto2_port/libgphoto2_port/gphoto2-port-info-list.c index afbecf259..bbfd80d98 100644 --- a/libgphoto2_port/libgphoto2_port/gphoto2-port-info-list.c +++ b/libgphoto2_port/libgphoto2_port/gphoto2-port-info-list.c @@ -25,6 +25,7 @@ #ifdef HAVE_ASM_SYMVERS # define __LIBGPHOTO2_INCLUDE_OLD_VERSIONS +# define __LIBGPHOTO2_INCLUDE_OLD_VERSIONS_INFOLIST #endif #include <gphoto2/gphoto2-port-info-list.h> @@ -166,11 +167,7 @@ gp_port_info_list_free (GPPortInfoList *list) * \return A non-negative number or a gphoto2 error code **/ int -#ifdef __LIBGPHOTO2_INCLUDE_OLD_VERSIONS -gp_port_info_list_append_v250 (GPPortInfoList *list, GPPortInfo info) -#else gp_port_info_list_append (GPPortInfoList *list, GPPortInfo info) -#endif { int generic, i; GPPortInfo *new_info; @@ -488,11 +485,7 @@ gp_port_info_list_lookup_name (GPPortInfoList *list, const char *name) * \return a gphoto2 error code **/ int -#ifdef __LIBGPHOTO2_INCLUDE_OLD_VERSIONS -gp_port_info_list_get_info_v250 (GPPortInfoList *list, int n, GPPortInfo *info) -#else gp_port_info_list_get_info (GPPortInfoList *list, int n, GPPortInfo *info) -#endif { int i; diff --git a/libgphoto2_port/libgphoto2_port/gphoto2-port.c b/libgphoto2_port/libgphoto2_port/gphoto2-port.c index ad202c95f..76cc54bb1 100644 --- a/libgphoto2_port/libgphoto2_port/gphoto2-port.c +++ b/libgphoto2_port/libgphoto2_port/gphoto2-port.c @@ -143,11 +143,7 @@ gp_port_exit (GPPort *port) * \return a gphoto2 error code **/ int -#ifdef __LIBGPHOTO2_INCLUDE_OLD_VERSIONS -gp_port_set_info_v250 (GPPort *port, GPPortInfo info) -#else gp_port_set_info (GPPort *port, GPPortInfo info) -#endif { GPPortLibraryOperations ops_func; @@ -250,11 +246,7 @@ gp_port_set_info_v240 (GPPort *port, GPPortInfo_v240 info) * \return a gphoto2 error code **/ int -#ifdef __LIBGPHOTO2_INCLUDE_OLD_VERSIONS -gp_port_get_info_v250 (GPPort *port, GPPortInfo *info) -#else gp_port_get_info (GPPort *port, GPPortInfo *info) -#endif { CHECK_NULL (port && info); |