Move compat macros in 'lttng/align.h' to a private header

[lttng-ust.git] / snprintf / local.h

diff --git a/snprintf/local.h b/snprintf/local.h
index d9251bf61c8021c5695aa526771d6a3214673442..e4af0ea2a776eb98e88ba5bf93c848f0f3db11d3 100644 (file)
--- a/snprintf/local.h
+++ b/snprintf/local.h
@@ -1,35 +1,13 @@
 /*     $OpenBSD: local.h,v 1.14 2009/10/22 01:23:16 guenther Exp $     */
 
-/*-
- * Copyright (c) 1990, 1993
+/*
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
+ * Copyright (C) 1990, 1993
  *     The Regents of the University of California.  All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by
  * Chris Torek.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
  */
 
 /*
@@ -37,28 +15,47 @@
  * in particular, macros and private variables.
  */
 
-#include <wchar.h> 
+#include <stdio.h>
+#include <wchar.h>
+#include "ust-helper.h"
 #include "various.h"
 #include "wcio.h"
 #include "fileext.h"
 
+LTTNG_HIDDEN
 int    __sflush(LTTNG_UST_LFILE *);
+LTTNG_HIDDEN
 LTTNG_UST_LFILE        *__sfp(void);
+LTTNG_HIDDEN
 int    __srefill(LTTNG_UST_LFILE *);
+LTTNG_HIDDEN
 int    __sread(void *, char *, int);
+LTTNG_HIDDEN
 int    __swrite(void *, const char *, int);
+LTTNG_HIDDEN
 fpos_t __sseek(void *, fpos_t, int);
+LTTNG_HIDDEN
 int    __sclose(void *);
+LTTNG_HIDDEN
 void   __sinit(void);
+LTTNG_HIDDEN
 void   _cleanup(void);
+LTTNG_HIDDEN
 void   __smakebuf(LTTNG_UST_LFILE *);
+LTTNG_HIDDEN
 int    __swhatbuf(LTTNG_UST_LFILE *, size_t *, int *);
+LTTNG_HIDDEN
 int    _fwalk(int (*)(LTTNG_UST_LFILE *));
+LTTNG_HIDDEN
 int    __swsetup(LTTNG_UST_LFILE *);
+LTTNG_HIDDEN
 int    __sflags(const char *, int *);
+LTTNG_HIDDEN
 wint_t __fgetwc_unlock(LTTNG_UST_LFILE *);
 
+LTTNG_HIDDEN
 extern void __atexit_register_cleanup(void (*)(void));
+LTTNG_HIDDEN
 extern int __sdidinit;
 
 /*