Additional comment changes for reformat of 1.0.1

[openssl.git] / crypto / dso / dso_dlfcn.c

diff --git a/crypto/dso/dso_dlfcn.c b/crypto/dso/dso_dlfcn.c
index c2bc61760bcc0f383564aac2843b31b9daabd33f..fb6f90a78c94a3defd3b8eb44c2d11f29938028a 100644 (file)
--- a/crypto/dso/dso_dlfcn.c
+++ b/crypto/dso/dso_dlfcn.c
@@ -60,10 +60,8 @@
    that handle _GNU_SOURCE and other similar macros.  Defining it later
    is simply too late, because those headers are protected from re-
    inclusion.  */
-#ifdef __linux
-# ifndef _GNU_SOURCE
-#  define _GNU_SOURCE  /* make sure dladdr is declared */
-# endif
+#ifndef _GNU_SOURCE
+# define _GNU_SOURCE   /* make sure dladdr is declared */
 #endif
 
 #include <stdio.h>
@@ -86,7 +84,8 @@ DSO_METHOD *DSO_METHOD_dlfcn(void)
 # if defined(_AIX) || defined(__CYGWIN__) || \
      defined(__SCO_VERSION__) || defined(_SCO_ELF) || \
      (defined(__osf__) && !defined(RTLD_NEXT))     || \
-     (defined(__OpenBSD__) && !defined(RTLD_SELF))
+     (defined(__OpenBSD__) && !defined(RTLD_SELF)) || \
+       defined(__ANDROID__)
 #  undef HAVE_DLINFO
 # endif
 #endif
@@ -402,7 +401,7 @@ static char *dlfcn_name_converter(DSO *dso, const char *filename)
        }
 
 #ifdef __sgi
-/*
+/*-
 This is a quote from IRIX manual for dladdr(3c):
 
      <dlfcn.h> does not contain a prototype for dladdr or definition of
@@ -463,7 +462,7 @@ static int dlfcn_pathbyaddr(void *addr,char *path,int sz)
                return len;
                }
 
-       ERR_add_error_data(4, "dlfcn_pathbyaddr(): ", dlerror());
+       ERR_add_error_data(2, "dlfcn_pathbyaddr(): ", dlerror());
 #endif
        return -1;
        }