Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src prefix compat with __ in case __dso_hidden is not available



details:   https://anonhg.NetBSD.org/src/rev/eb3519ab5958
branches:  trunk
changeset: 790370:eb3519ab5958
user:      christos <christos%NetBSD.org@localhost>
date:      Fri Oct 04 21:07:37 2013 +0000

description:
prefix compat with __ in case __dso_hidden is not available

diffstat:

 lib/libc/compat/gen/compat___fts13.c      |   8 ++++----
 lib/libc/compat/gen/compat___fts30.c      |   8 ++++----
 lib/libc/compat/gen/compat___fts31.c      |   8 ++++----
 lib/libc/compat/gen/compat___fts32.c      |   8 ++++----
 lib/libc/compat/gen/compat_fts.c          |   8 ++++----
 lib/libc/compat/gen/compat_getmntinfo.c   |  14 +++++++-------
 lib/libc/compat/gen/compat_glob.c         |   8 ++++----
 lib/libc/compat/gen/compat_time.c         |   4 ++--
 lib/libc/compat/gen/compat_times.c        |   6 +++---
 lib/libc/compat/sys/compat___fhstat30.c   |  10 +++++-----
 lib/libc/compat/sys/compat___stat13.c     |  20 ++++++++++----------
 lib/libc/compat/sys/compat___stat30.c     |  20 ++++++++++----------
 lib/libc/compat/sys/compat_getrusage.c    |   8 ++++----
 lib/libc/compat/sys/compat_gettimeofday.c |   8 ++++----
 lib/libc/compat/sys/compat_mknod.c        |   8 ++++----
 lib/libc/compat/sys/compat_stat.c         |  16 ++++++++--------
 lib/libc/compat/sys/compat_statfs.c       |  20 ++++++++++----------
 sys/compat/sys/mount.h                    |  18 +++++++++---------
 sys/compat/sys/resource.h                 |   4 ++--
 sys/compat/sys/stat.h                     |  22 +++++++++++-----------
 sys/compat/sys/time.h                     |   4 ++--
 21 files changed, 115 insertions(+), 115 deletions(-)

diffs (truncated from 737 to 300 lines):

diff -r f944cc60ef38 -r eb3519ab5958 lib/libc/compat/gen/compat___fts13.c
--- a/lib/libc/compat/gen/compat___fts13.c      Fri Oct 04 20:49:16 2013 +0000
+++ b/lib/libc/compat/gen/compat___fts13.c      Fri Oct 04 21:07:37 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: compat___fts13.c,v 1.10 2013/10/04 20:49:16 christos Exp $     */
+/*     $NetBSD: compat___fts13.c,v 1.11 2013/10/04 21:07:37 christos Exp $     */
 
 #include "namespace.h"
 #include <sys/cdefs.h>
@@ -42,9 +42,9 @@
     ((a) > USHRT_MAX ? USHRT_MAX : (unsigned short)(a))
 #endif
 
-#define        stat            compat___stat13
-#define        lstat           compat___lstat13
-#define        fstat           compat___fstat13
+#define        stat            __compat___stat13
+#define        lstat           __compat___lstat13
+#define        fstat           __compat___fstat13
 
 #undef fts_children
 #define        fts_children __fts_children13
diff -r f944cc60ef38 -r eb3519ab5958 lib/libc/compat/gen/compat___fts30.c
--- a/lib/libc/compat/gen/compat___fts30.c      Fri Oct 04 20:49:16 2013 +0000
+++ b/lib/libc/compat/gen/compat___fts30.c      Fri Oct 04 21:07:37 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: compat___fts30.c,v 1.7 2013/10/04 20:49:16 christos Exp $      */
+/*     $NetBSD: compat___fts30.c,v 1.8 2013/10/04 21:07:37 christos Exp $      */
 
 #include "namespace.h"
 #include <sys/cdefs.h>
@@ -32,9 +32,9 @@
 #define        __fts_dev_t     uint32_t
 #define        __fts_level_t   short
 
-#define        stat            compat___stat30
-#define        lstat           compat___lstat30
-#define        fstat           compat___fstat30
+#define        stat            __compat___stat30
+#define        lstat           __compat___lstat30
+#define        fstat           __compat___fstat30
 
 #ifndef ftsent_namelen_truncate
 #define ftsent_namelen_truncate(a)     \
diff -r f944cc60ef38 -r eb3519ab5958 lib/libc/compat/gen/compat___fts31.c
--- a/lib/libc/compat/gen/compat___fts31.c      Fri Oct 04 20:49:16 2013 +0000
+++ b/lib/libc/compat/gen/compat___fts31.c      Fri Oct 04 21:07:37 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: compat___fts31.c,v 1.5 2013/10/04 20:49:16 christos Exp $      */
+/*     $NetBSD: compat___fts31.c,v 1.6 2013/10/04 21:07:37 christos Exp $      */
 
 #include "namespace.h"
 #include <sys/cdefs.h>
@@ -40,9 +40,9 @@
     ((a) > USHRT_MAX ? USHRT_MAX : (unsigned short)(a))
 #endif
 
-#define        stat            compat___stat30
-#define        lstat           compat___lstat30
-#define        fstat           compat___fstat30
+#define        stat            __compat___stat30
+#define        lstat           __compat___lstat30
+#define        fstat           __compat___fstat30
 
 #undef fts_children
 #define        fts_children __fts_children31
diff -r f944cc60ef38 -r eb3519ab5958 lib/libc/compat/gen/compat___fts32.c
--- a/lib/libc/compat/gen/compat___fts32.c      Fri Oct 04 20:49:16 2013 +0000
+++ b/lib/libc/compat/gen/compat___fts32.c      Fri Oct 04 21:07:37 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: compat___fts32.c,v 1.4 2013/10/04 20:49:16 christos Exp $      */
+/*     $NetBSD: compat___fts32.c,v 1.5 2013/10/04 21:07:37 christos Exp $      */
 
 #include "namespace.h"
 #include <sys/cdefs.h>
@@ -46,8 +46,8 @@
 
 #define        __FTS_COMPAT_LEVEL
 
-#define        stat            compat___stat30
-#define        lstat           compat___lstat30
-#define        fstat           compat___fstat30
+#define        stat            __compat___stat30
+#define        lstat           __compat___lstat30
+#define        fstat           __compat___fstat30
 
 #include "gen/fts.c"
diff -r f944cc60ef38 -r eb3519ab5958 lib/libc/compat/gen/compat_fts.c
--- a/lib/libc/compat/gen/compat_fts.c  Fri Oct 04 20:49:16 2013 +0000
+++ b/lib/libc/compat/gen/compat_fts.c  Fri Oct 04 21:07:37 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: compat_fts.c,v 1.7 2013/10/04 20:49:16 christos Exp $  */
+/*     $NetBSD: compat_fts.c,v 1.8 2013/10/04 21:07:37 christos Exp $  */
 
 /*
  * Written by Jason R. Thorpe <thorpej%NetBSD.org@localhost>, October 21, 1997.
@@ -62,8 +62,8 @@
 #define        __FTS_COMPAT_LENGTH
 #define        __FTS_COMPAT_LEVEL
 
-#define stat compat_stat
-#define lstat compat_lstat
-#define fstat compat_fstat
+#define stat __compat_stat
+#define lstat __compat_lstat
+#define fstat __compat_fstat
 
 #include "gen/fts.c"
diff -r f944cc60ef38 -r eb3519ab5958 lib/libc/compat/gen/compat_getmntinfo.c
--- a/lib/libc/compat/gen/compat_getmntinfo.c   Fri Oct 04 20:49:16 2013 +0000
+++ b/lib/libc/compat/gen/compat_getmntinfo.c   Fri Oct 04 21:07:37 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: compat_getmntinfo.c,v 1.3 2013/10/04 20:49:16 christos Exp $   */
+/*     $NetBSD: compat_getmntinfo.c,v 1.4 2013/10/04 21:07:37 christos Exp $   */
 
 /*
  * Copyright (c) 1989, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)getmntinfo.c       8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: compat_getmntinfo.c,v 1.3 2013/10/04 20:49:16 christos Exp $");
+__RCSID("$NetBSD: compat_getmntinfo.c,v 1.4 2013/10/04 21:07:37 christos Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -50,13 +50,13 @@
 #include <errno.h>
 #include <stdlib.h>
 
-__strong_alias(getmntinfo, compat_getmntinfo)
+__strong_alias(getmntinfo, __compat_getmntinfo)
 
 /*
  * Return information about mounted filesystems.
  */
 int
-compat_getmntinfo(struct statfs12 **mntbufp, int flags)
+__compat_getmntinfo(struct statfs12 **mntbufp, int flags)
 {
        static struct statfs12 *mntbuf;
        static int mntsize;
@@ -65,10 +65,10 @@
        _DIAGASSERT(mntbufp != NULL);
 
        if (mntsize <= 0 &&
-           (mntsize = compat_getfsstat(NULL, 0L, MNT_NOWAIT)) == -1)
+           (mntsize = __compat_getfsstat(NULL, 0L, MNT_NOWAIT)) == -1)
                return (0);
        if (bufsize > 0 &&
-           (mntsize = compat_getfsstat(mntbuf, (long)bufsize, flags)) == -1)
+           (mntsize = __compat_getfsstat(mntbuf, (long)bufsize, flags)) == -1)
                return (0);
        while (bufsize <= mntsize * sizeof(struct statfs12)) {
                if (mntbuf)
@@ -76,7 +76,7 @@
                bufsize = (mntsize + 1) * sizeof(struct statfs12);
                if ((mntbuf = malloc(bufsize)) == NULL)
                        return (0);
-               if ((mntsize = compat_getfsstat(mntbuf, (long)bufsize,
+               if ((mntsize = __compat_getfsstat(mntbuf, (long)bufsize,
                    flags)) == -1)
                        return (0);
        }
diff -r f944cc60ef38 -r eb3519ab5958 lib/libc/compat/gen/compat_glob.c
--- a/lib/libc/compat/gen/compat_glob.c Fri Oct 04 20:49:16 2013 +0000
+++ b/lib/libc/compat/gen/compat_glob.c Fri Oct 04 21:07:37 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: compat_glob.c,v 1.3 2013/10/04 20:49:16 christos Exp $ */
+/*     $NetBSD: compat_glob.c,v 1.4 2013/10/04 21:07:37 christos Exp $ */
 
 /*
  * Written by Jason R. Thorpe <thorpej%NetBSD.org@localhost>, October 21, 1997.
@@ -28,8 +28,8 @@
 __warn_references(globfree,
     "warning: reference to compatibility globfree(); include <glob.h> for correct reference")
 
-#define stat compat_stat
-#define lstat compat_lstat
-#define fstat compat_fstat
+#define stat __compat_stat
+#define lstat __compat_lstat
+#define fstat __compat_fstat
 
 #include "gen/glob.c"
diff -r f944cc60ef38 -r eb3519ab5958 lib/libc/compat/gen/compat_time.c
--- a/lib/libc/compat/gen/compat_time.c Fri Oct 04 20:49:16 2013 +0000
+++ b/lib/libc/compat/gen/compat_time.c Fri Oct 04 21:07:37 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: compat_time.c,v 1.3 2013/10/04 20:49:16 christos Exp $ */
+/*     $NetBSD: compat_time.c,v 1.4 2013/10/04 21:07:37 christos Exp $ */
 
 /*
  * Written by Jason R. Thorpe <thorpej%NetBSD.org@localhost>, October 21, 1997.
@@ -25,6 +25,6 @@
 #define timeval timeval50
 #define time_t int32_t
 
-#define gettimeofday compat_gettimeofday
+#define gettimeofday __compat_gettimeofday
 
 #include "gen/time.c"
diff -r f944cc60ef38 -r eb3519ab5958 lib/libc/compat/gen/compat_times.c
--- a/lib/libc/compat/gen/compat_times.c        Fri Oct 04 20:49:16 2013 +0000
+++ b/lib/libc/compat/gen/compat_times.c        Fri Oct 04 21:07:37 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: compat_times.c,v 1.3 2013/10/04 20:49:16 christos Exp $        */
+/*     $NetBSD: compat_times.c,v 1.4 2013/10/04 21:07:37 christos Exp $        */
 
 /*
  * Ben Harris, 2002.
@@ -25,7 +25,7 @@
 #define __times_rusage struct rusage50
 #define __times_timeval struct timeval50
 
-#define getrusage compat_getrusage
-#define gettimeofday compat_gettimeofday
+#define getrusage __compat_getrusage
+#define gettimeofday __compat_gettimeofday
 
 #include "gen/times.c"
diff -r f944cc60ef38 -r eb3519ab5958 lib/libc/compat/sys/compat___fhstat30.c
--- a/lib/libc/compat/sys/compat___fhstat30.c   Fri Oct 04 20:49:16 2013 +0000
+++ b/lib/libc/compat/sys/compat___fhstat30.c   Fri Oct 04 21:07:37 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: compat___fhstat30.c,v 1.5 2013/10/04 20:49:16 christos Exp $   */
+/*     $NetBSD: compat___fhstat30.c,v 1.6 2013/10/04 21:07:37 christos Exp $   */
 
 /*-
  * Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
 
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: compat___fhstat30.c,v 1.5 2013/10/04 20:49:16 christos Exp $");
+__RCSID("$NetBSD: compat___fhstat30.c,v 1.6 2013/10/04 21:07:37 christos Exp $");
 #endif /* LIBC_SCCS and not lint */
 
 #define __LIBC12_SOURCE__
@@ -45,13 +45,13 @@
 __warn_references(fhstat,
     "warning: reference to compatibility __fhstat30(); include <sys/mount.h> to generate correct reference")
 
-__strong_alias(__fhstat30, compat___fhstat30)
+__strong_alias(__fhstat30, __compat___fhstat30)
 
 /*
  * Convert old fhstat() call to new calling convention
  */
 int
-compat___fhstat30(const struct compat_30_fhandle *fhp, struct stat30 *sb)
+__compat___fhstat30(const struct compat_30_fhandle *fhp, struct stat30 *sb)
 {
-       return compat___fhstat40(fhp, FHANDLE30_SIZE, sb);
+       return __compat___fhstat40(fhp, FHANDLE30_SIZE, sb);
 }
diff -r f944cc60ef38 -r eb3519ab5958 lib/libc/compat/sys/compat___stat13.c
--- a/lib/libc/compat/sys/compat___stat13.c     Fri Oct 04 20:49:16 2013 +0000
+++ b/lib/libc/compat/sys/compat___stat13.c     Fri Oct 04 21:07:37 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: compat___stat13.c,v 1.5 2013/10/04 20:49:16 christos Exp $     */
+/*     $NetBSD: compat___stat13.c,v 1.6 2013/10/04 21:07:37 christos Exp $     */
 
 /*
  * Copyright (c) 1997 Frank van der Linden
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: compat___stat13.c,v 1.5 2013/10/04 20:49:16 christos Exp $");
+__RCSID("$NetBSD: compat___stat13.c,v 1.6 2013/10/04 21:07:37 christos Exp $");
 #endif /* LIBC_SCCS and not lint */
 
 #define __LIBC12_SOURCE__
@@ -58,10 +58,10 @@
 __warn_references(fhstat,
     "warning: reference to compatibility fhstat(); include <sys/mount.h> to generate correct reference")
 
-__strong_alias(__stat13, compat___stat13)
-__strong_alias(__fstat13, compat___fstat13)
-__strong_alias(__lstat13, compat___lstat13)
-__strong_alias(fhstat, compat_fhstat)
+__strong_alias(__stat13, __compat___stat13)
+__strong_alias(__fstat13, __compat___fstat13)
+__strong_alias(__lstat13, __compat___lstat13)
+__strong_alias(fhstat, __compat_fhstat)
 
 /*
  * Convert from a new to an old stat structure.
@@ -96,7 +96,7 @@
 }
 
 int
-compat___stat13(const char *file, struct stat13 *ost)
+__compat___stat13(const char *file, struct stat13 *ost)
 {
        struct stat nst;
        int ret;
@@ -108,7 +108,7 @@
 }



Home | Main Index | Thread Index | Old Index