From 5da2caf45a909abd93a9ff85538136c225986e47 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Sat, 29 Dec 2007 22:30:42 +0000 Subject: [PATCH] same for gphoto2-port git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@10911 67ed7778-7388-44ab-90cf-0a291f65f57c --- libgphoto2_port/gphoto2/gphoto2-port.h | 7 +++++-- libgphoto2_port/libgphoto2_port/gphoto2-port.c | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/libgphoto2_port/gphoto2/gphoto2-port.h b/libgphoto2_port/gphoto2/gphoto2-port.h index 7580d4dcc..d50f0c41c 100644 --- a/libgphoto2_port/gphoto2/gphoto2-port.h +++ b/libgphoto2_port/gphoto2/gphoto2-port.h @@ -223,15 +223,18 @@ const char *gp_port_get_error (GPPort *port); #ifdef __LIBGPHOTO2_INCLUDE_OLD_VERSIONS int gp_port_set_info_v240 (GPPort *port, GPPortInfo_v240 info); int gp_port_set_info_v250 (GPPort *port, GPPortInfo info); +int gp_port_get_info_v240 (GPPort *port, GPPortInfo_v240 *info); +int gp_port_get_info_v250 (GPPort *port, GPPortInfo *info); + +#ifdef __LIBGPHOTO2_INCLUDE_OLD_VERSIONS_PORT asm(".symver gp_port_set_info_v240, gp_port_set_info@LIBGPHOTO2_0_0"); asm(".symver gp_port_set_info_v250, gp_port_set_info@@LIBGPHOTO2_5_0"); #define gp_port_set_info gp_port_set_info_v250 -int gp_port_get_info_v240 (GPPort *port, GPPortInfo_v240 *info); -int gp_port_get_info_v250 (GPPort *port, GPPortInfo *info); asm(".symver gp_port_get_info_v240, gp_port_get_info@LIBGPHOTO2_0_0"); asm(".symver gp_port_get_info_v250, gp_port_get_info@@LIBGPHOTO2_5_0"); #define gp_port_get_info gp_port_get_info_v250 #endif +#endif /* DEPRECATED */ /** \deprecated internal typedef */ diff --git a/libgphoto2_port/libgphoto2_port/gphoto2-port.c b/libgphoto2_port/libgphoto2_port/gphoto2-port.c index 76cc54bb1..2228e1c70 100644 --- a/libgphoto2_port/libgphoto2_port/gphoto2-port.c +++ b/libgphoto2_port/libgphoto2_port/gphoto2-port.c @@ -34,6 +34,7 @@ #ifdef HAVE_ASM_SYMVERS # define __LIBGPHOTO2_INCLUDE_OLD_VERSIONS +# define __LIBGPHOTO2_INCLUDE_OLD_VERSIONS_PORT #endif #include