/[svn]/ircd-hybrid-7.3/libltdl/ltdl.c
ViewVC logotype

Diff of /ircd-hybrid-7.3/libltdl/ltdl.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1252 by michael, Tue Nov 2 15:19:41 2010 UTC revision 1253 by michael, Tue Nov 1 09:03:49 2011 UTC
# Line 1  Line 1 
1  /* ltdl.c -- system independent dlopen wrapper  /* ltdl.c -- system independent dlopen wrapper
2    
3     Copyright (C) 1998, 1999, 2000, 2004, 2005, 2006,     Copyright (C) 1998, 1999, 2000, 2004, 2005, 2006,
4                   2007, 2008 Free Software Foundation, Inc.                   2007, 2008, 2011 Free Software Foundation, Inc.
5     Written by Thomas Tanner, 1998     Written by Thomas Tanner, 1998
6    
7     NOTE: The canonical source of this file is maintained with the     NOTE: The canonical source of this file is maintained with the
# Line 80  static  const char     libprefix[]             = LT_LIB Line 80  static  const char     libprefix[]             = LT_LIB
80  #if defined(LT_MODULE_EXT)  #if defined(LT_MODULE_EXT)
81  static  const char      shlib_ext[]             = LT_MODULE_EXT;  static  const char      shlib_ext[]             = LT_MODULE_EXT;
82  #endif  #endif
83    /* If the loadable module suffix is not the same as the linkable
84     * shared library suffix, this will be defined. */
85    #if defined(LT_SHARED_EXT)
86    static  const char      shared_ext[]            = LT_SHARED_EXT;
87    #endif
88  #if defined(LT_DLSEARCH_PATH)  #if defined(LT_DLSEARCH_PATH)
89  static  const char      sys_dlsearch_path[]     = LT_DLSEARCH_PATH;  static  const char      sys_dlsearch_path[]     = LT_DLSEARCH_PATH;
90  #endif  #endif
# Line 1537  has_library_ext (const char *filename) Line 1542  has_library_ext (const char *filename)
1542  #if defined(LT_MODULE_EXT)  #if defined(LT_MODULE_EXT)
1543               || (streq (ext, shlib_ext))               || (streq (ext, shlib_ext))
1544  #endif  #endif
1545    #if defined(LT_SHARED_EXT)
1546                 || (streq (ext, shared_ext))
1547    #endif
1548      ))      ))
1549      {      {
1550        return 1;        return 1;
# Line 1679  lt_dlopenadvise (const char *filename, l Line 1687  lt_dlopenadvise (const char *filename, l
1687    
1688        /* As before, if the file was found but loading failed, return now        /* As before, if the file was found but loading failed, return now
1689           with the current error message.  */           with the current error message.  */
1690          if (handle || ((errors > 0) && !file_not_found ()))
1691            return handle;
1692    #endif
1693    
1694    #if defined(LT_SHARED_EXT)
1695          /* Try appending SHARED_EXT.   */
1696          LT__SETERRORSTR (saved_error);
1697          errors = try_dlopen (&handle, filename, shared_ext, advise);
1698    
1699          /* As before, if the file was found but loading failed, return now
1700             with the current error message.  */
1701        if (handle || ((errors > 0) && !file_not_found ()))        if (handle || ((errors > 0) && !file_not_found ()))
1702          return handle;          return handle;
1703  #endif  #endif

Legend:
Removed from v.1252  
changed lines
  Added in v.1253

svnadmin@ircd-hybrid.org
ViewVC Help
Powered by ViewVC 1.1.28