Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
E.h misc.c sound_esd.c tclass.h text_pango.c text_xft.c
ttfont.c util.h
Log Message:
Add optional visibility hiding (only useful with modular build).
===================================================================
RCS file: /cvs/e/e16/e/src/E.h,v
retrieving revision 1.594
retrieving revision 1.595
diff -u -3 -r1.594 -r1.595
--- E.h 23 Aug 2007 18:48:20 -0000 1.594
+++ E.h 12 Sep 2007 21:33:49 -0000 1.595
@@ -661,8 +661,8 @@
extern const char e_wm_name[];
extern const char e_wm_version[];
extern const char e_wm_date[];
-extern Display *disp;
+__EXPORT__ extern Display *disp;
extern RealRoot RRoot;
-extern VirtRoot VRoot;
-extern EConf Conf;
-extern EMode Mode;
+__EXPORT__ extern VirtRoot VRoot;
+__EXPORT__ extern EConf Conf;
+__EXPORT__ extern EMode Mode;
===================================================================
RCS file: /cvs/e/e16/e/src/misc.c,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -3 -r1.78 -r1.79
--- misc.c 3 Sep 2007 19:37:57 -0000 1.78
+++ misc.c 12 Sep 2007 21:33:50 -0000 1.79
@@ -344,6 +344,8 @@
Esnprintf(buf, sizeof(buf), "%s_%s", sym, name);
h = dlsym(h, buf);
+ if (!h)
+ Eprintf("*** ModLoad %s: %s\n", buf, dlerror());
return h;
}
===================================================================
RCS file: /cvs/e/e16/e/src/sound_esd.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- sound_esd.c 28 Aug 2007 21:54:00 -0000 1.2
+++ sound_esd.c 12 Sep 2007 21:33:50 -0000 1.3
@@ -27,6 +27,10 @@
#include <esd.h>
#include <audiofile.h>
+#ifdef USE_MODULES
+#define Estrdup strdup
+#endif
+
struct _sample
{
char *file; /* We should not need this */
@@ -162,7 +166,7 @@
sound_fd = -1;
}
-extern const SoundOps SoundOps_esd;
+__EXPORT__ extern const SoundOps SoundOps_esd;
const SoundOps SoundOps_esd = {
_esd_Init, _esd_Exit, _esd_Load, _esd_Destroy, _esd_Play,
};
===================================================================
RCS file: /cvs/e/e16/e/src/tclass.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- tclass.h 28 Aug 2007 17:58:23 -0000 1.23
+++ tclass.h 12 Sep 2007 21:33:50 -0000 1.24
@@ -107,7 +107,7 @@
/* text.c */
TextState *TextclassGetTextState(TextClass * tclass, int state,
int active, int sticky);
-void TextstateTextFit(TextState * ts, char **ptext, int *pw,
+__EXPORT__ void TextstateTextFit(TextState * ts, char **ptext, int *pw,
int textwidth_limit);
void TextstateTextDraw(TextState * ts, Win win, Drawable draw,
const char *text, int x, int y, int w,
@@ -121,9 +121,9 @@
const char *text, int x, int y, int w, int h,
int fsize, int justification);
-int _xft_FdcInit(TextState * ts, Win win, Drawable draw);
-void _xft_FdcFini(TextState * ts);
-void _xft_FdcSetDrawable(TextState * ts, unsigned long draw);
-void _xft_FdcSetColor(TextState * ts, EColor * xc);
+__EXPORT__ int _xft_FdcInit(TextState * ts, Win win, Drawable draw);
+__EXPORT__ void _xft_FdcFini(TextState * ts);
+__EXPORT__ void _xft_FdcSetDrawable(TextState * ts, unsigned long draw);
+__EXPORT__ void _xft_FdcSetColor(TextState * ts, EColor * xc);
#endif /* _TCLASS_H */
===================================================================
RCS file: /cvs/e/e16/e/src/text_pango.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- text_pango.c 25 Aug 2007 05:38:53 -0000 1.1
+++ text_pango.c 12 Sep 2007 21:33:50 -0000 1.2
@@ -31,7 +31,7 @@
/*
* Pango-Xft
*/
-extern const FontOps FontOps_pango;
+__EXPORT__ extern const FontOps FontOps_pango;
static PangoContext *_pango_ctx = NULL;
===================================================================
RCS file: /cvs/e/e16/e/src/text_xft.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- text_xft.c 28 Aug 2007 17:58:23 -0000 1.2
+++ text_xft.c 12 Sep 2007 21:33:50 -0000 1.3
@@ -31,7 +31,7 @@
/*
* Xft
*/
-extern const FontOps FontOps_xft;
+__EXPORT__ extern const FontOps FontOps_xft;
typedef struct
{
===================================================================
RCS file: /cvs/e/e16/e/src/ttfont.c,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -3 -r1.62 -r1.63
--- ttfont.c 28 Aug 2007 17:58:23 -0000 1.62
+++ ttfont.c 12 Sep 2007 21:33:50 -0000 1.63
@@ -31,7 +31,7 @@
/*
* Imlib2/FreeType
*/
-extern const FontOps FontOps_ift;
+__EXPORT__ extern const FontOps FontOps_ift;
typedef void EFont;
===================================================================
RCS file: /cvs/e/e16/e/src/util.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- util.h 3 Sep 2007 19:37:58 -0000 1.12
+++ util.h 12 Sep 2007 21:33:50 -0000 1.13
@@ -27,6 +27,15 @@
#include "config.h"
#include <stdarg.h>
+/* Inspired by Xfuncproto.h */
+#if defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 303)
+# define __EXPORT__ __attribute__((visibility("default")))
+#elif defined(__SUNPRO_C) && (__SUNPRO_C >= 0x550)
+# define __EXPORT__ __global
+#else /* not gcc >= 3.3 and not Sun Studio >= 8 */
+# define __EXPORT__
+#endif
+
#if HAVE___ATTRIBUTE__
#define __PRINTF__ __attribute__((__format__(__printf__, 1, 2)))
#else
@@ -63,12 +72,12 @@
char *Estrdupcat2(char *ss, const char *s1, const char *s2);
char **StrlistDup(char **lst, int num);
-void StrlistFree(char **lst, int num);
+__EXPORT__ void StrlistFree(char **lst, int num);
char *StrlistJoin(char **lst, int num);
char *StrlistEncodeEscaped(char *buf, int len, char **lst,
int num);
char **StrlistDecodeEscaped(const char *str, int *pnum);
-char **StrlistFromString(const char *str, int delim, int *num);
+__EXPORT__ char **StrlistFromString(const char *str, int delim, int *num);
void Esetenv(const char *name, const char *value);
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
