fix EINTERN to be more portable and not require e.h in mixer pulse

SVN revision: 77613
This commit is contained in:
Mike Blumenkrantz 2012-10-09 07:08:00 +00:00
parent 6b4b4f0ae1
commit 5e17a3eaac
3 changed files with 33 additions and 5 deletions

View File

@ -4,6 +4,19 @@
#include <Eina.h>
#include <inttypes.h>
# ifdef EINTERN
# undef EINTERN
# endif
# ifdef __GNUC__
# if __GNUC__ >= 4
# define EINTERN __attribute__ ((visibility("hidden")))
# else
# define EINTERN
# endif
# else
# define EINTERN
# endif
#define PULSE_SUCCESS (void*)1
extern int PULSE_EVENT_CONNECTED;

View File

@ -1,4 +1,3 @@
#include "e.h"
#include <Ecore.h>
#include <Ecore_Con.h>
#include <arpa/inet.h>
@ -747,7 +746,7 @@ pulse_connect(Pulse *conn)
return !!conn->svr;
}
EINTERN void
void
pulse_disconnect(Pulse *conn)
{
EINA_SAFETY_ON_NULL_RETURN(conn);

View File

@ -1,7 +1,9 @@
#ifndef PA_HACKS_H
#define PA_HACKS_H
#include "e.h"
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#include <Ecore.h>
#include <Ecore_Con.h>
@ -17,14 +19,28 @@
# define __UNUSED__ __attribute__((unused))
#endif
# ifdef EINTERN
# undef EINTERN
# endif
# ifdef __GNUC__
# if __GNUC__ >= 4
# define EINTERN __attribute__ ((visibility("hidden")))
# else
# define EINTERN
# endif
# else
# define EINTERN
# endif
#define PA_PROTOCOL_VERSION 16
#define PA_NATIVE_COOKIE_LENGTH 256
#ifndef PA_MACHINE_ID
# define PA_MACHINE_ID "/var/lib/dbus/machine-id"
#endif
#undef _
#define _(X) (X)
#ifndef _
# define _(X) (X)
#endif
#undef DBG
#undef INF