Rename __noinline/__always_inline to prevent clash with headers.

With this change noinline can be used in ldpreload.h.
This commit is contained in:
Simon Ruderich
2013-06-10 14:55:13 +02:00
parent 488159627f
commit b75b0ec399
4 changed files with 14 additions and 20 deletions

View File

@@ -20,6 +20,8 @@
#include <config.h>
#include "compiler.h"
/* Must be loaded before the following headers. */
#include "ldpreload.h"
@@ -51,7 +53,6 @@ static int force_write_to_non_tty;
#include "constants.h"
#include "compiler.h"
#ifdef DEBUG
# include "debug.h"
#endif
@@ -67,7 +68,7 @@ static int force_write_to_non_tty;
/* Prevent inlining into hook functions because it may increase the number of
* spilled registers unnecessarily. As it's not called very often accept the
* additional call. */
static int isatty_noinline(int fd) __noinline;
static int isatty_noinline(int fd) noinline;
static int isatty_noinline(int fd) {
int saved_errno = errno;
int result = isatty(fd);
@@ -137,10 +138,10 @@ static void init_pre_post_string(void) {
/* Don't inline any of the pre/post functions. Keep the hook function as small
* as possible for speed reasons. */
static void handle_fd_pre(int fd) __noinline;
static void handle_fd_post(int fd) __noinline;
static void handle_file_pre(FILE *stream) __noinline;
static void handle_file_post(FILE *stream) __noinline;
static void handle_fd_pre(int fd) noinline;
static void handle_fd_post(int fd) noinline;
static void handle_file_pre(FILE *stream) noinline;
static void handle_file_post(FILE *stream) noinline;
static void handle_fd_pre(int fd) {
int saved_errno = errno;