[gphoto-cvs] SF.net SVN: gphoto: [10911] trunk/libgphoto2/libgphoto2_port

[<mar...@us...>]

Revision: 10911
          http://gphoto.svn.sourceforge.net/gphoto/?rev=10911&view=rev
Author:   marcusmeissner
Date:     2007-12-29 14:30:42 -0800 (Sat, 29 Dec 2007)

Log Message:
-----------
same for gphoto2-port

Modified Paths:
--------------
    trunk/libgphoto2/libgphoto2_port/gphoto2/gphoto2-port.h
    trunk/libgphoto2/libgphoto2_port/libgphoto2_port/gphoto2-port.c

Modified: trunk/libgphoto2/libgphoto2_port/gphoto2/gphoto2-port.h
===================================================================
--- trunk/libgphoto2/libgphoto2_port/gphoto2/gphoto2-port.h	2007-12-29 22:28:06 UTC (rev 10910)
+++ trunk/libgphoto2/libgphoto2_port/gphoto2/gphoto2-port.h	2007-12-29 22:30:42 UTC (rev 10911)
@@ -223,15 +223,18 @@
 #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 */

Modified: trunk/libgphoto2/libgphoto2_port/libgphoto2_port/gphoto2-port.c
===================================================================
--- trunk/libgphoto2/libgphoto2_port/libgphoto2_port/gphoto2-port.c	2007-12-29 22:28:06 UTC (rev 10910)
+++ trunk/libgphoto2/libgphoto2_port/libgphoto2_port/gphoto2-port.c	2007-12-29 22:30:42 UTC (rev 10911)
@@ -34,6 +34,7 @@
 
 #ifdef HAVE_ASM_SYMVERS
 # define __LIBGPHOTO2_INCLUDE_OLD_VERSIONS
+# define __LIBGPHOTO2_INCLUDE_OLD_VERSIONS_PORT
 #endif
 
 #include <gphoto2/gphoto2-port-result.h>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.