From f3de71d05f2d34053924be0c08fa3e3538d6bdc0 Mon Sep 17 00:00:00 2001 From: Kim Woelders Date: Sat, 9 Jan 2021 09:45:09 +0100 Subject: [PATCH] Consistently put __EXPORT__ in .c files --- src/E.h | 6 +++--- src/edebug.h | 4 ++-- src/main.c | 6 +++--- src/memory.c | 4 ++-- src/misc.c | 6 +++--- src/tclass.h | 12 ++++++------ src/text.c | 4 ++-- src/text_xft.c | 10 +++++----- src/util.h | 6 +++--- src/x.c | 6 +++--- src/xwin.h | 6 +++--- 11 files changed, 35 insertions(+), 35 deletions(-) diff --git a/src/E.h b/src/E.h index 032f5df9..fa5b581d 100644 --- a/src/E.h +++ b/src/E.h @@ -3,7 +3,7 @@ /*****************************************************************************/ /* * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors - * Copyright (C) 2004-2020 Kim Woelders + * Copyright (C) 2004-2021 Kim Woelders * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to @@ -560,5 +560,5 @@ char **ThemesList(int *num); */ extern const char e_wm_name[]; extern const char e_wm_version[]; -__EXPORT__ extern EConf Conf; -__EXPORT__ extern EMode Mode; +extern EConf Conf; +extern EMode Mode; diff --git a/src/edebug.h b/src/edebug.h index 3d1d820b..7d6c083b 100644 --- a/src/edebug.h +++ b/src/edebug.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2014 Kim Woelders + * Copyright (C) 2006-2021 Kim Woelders * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to @@ -67,7 +67,7 @@ void EDebugInit(const char *s); void EDebugSet(unsigned int type, int value); -__EXPORT__ int EDebug(unsigned int type); +int EDebug(unsigned int type); #else diff --git a/src/main.c b/src/main.c index cd27508c..03d5a66f 100644 --- a/src/main.c +++ b/src/main.c @@ -1,6 +1,6 @@ /* * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors - * Copyright (C) 2004-2020 Kim Woelders + * Copyright (C) 2004-2021 Kim Woelders * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to @@ -50,8 +50,8 @@ const char e_wm_name[] = "e16"; const char e_wm_version[] = E16_VERSION; -EConf Conf; -EMode Mode; +__EXPORT__ EConf Conf; +__EXPORT__ EMode Mode; static int EoptGet(int argc, char **argv); static void EoptHelp(void); diff --git a/src/memory.c b/src/memory.c index 1477a3fe..16979ed6 100644 --- a/src/memory.c +++ b/src/memory.c @@ -1,6 +1,6 @@ /* * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors - * Copyright (C) 2005-2020 Kim Woelders + * Copyright (C) 2005-2021 Kim Woelders * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to @@ -29,7 +29,7 @@ #include "util.h" -void +__EXPORT__ void EfreeNull(void **p) { Efree(*p); diff --git a/src/misc.c b/src/misc.c index d84caf20..a36f058f 100644 --- a/src/misc.c +++ b/src/misc.c @@ -1,6 +1,6 @@ /* * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors - * Copyright (C) 2004-2015 Kim Woelders + * Copyright (C) 2004-2021 Kim Woelders * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to @@ -52,7 +52,7 @@ _tvdiff(struct timeval *tvd, const struct timeval *tv1, tvd->tv_usec = tus; } -void +__EXPORT__ void Eprintf(const char *fmt, ...) { FILE *fprt; @@ -141,7 +141,7 @@ EDebugInit(const char *param) } } -int +__EXPORT__ int EDebug(unsigned int type) { return (ev_debug && diff --git a/src/tclass.h b/src/tclass.h index b70c2456..5d46b1b9 100644 --- a/src/tclass.h +++ b/src/tclass.h @@ -1,6 +1,6 @@ /* * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors - * Copyright (C) 2004-2014 Kim Woelders + * Copyright (C) 2004-2021 Kim Woelders * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to @@ -98,7 +98,7 @@ void TextclassSetJustification(TextClass * tc, int just); /* text.c */ TextState *TextclassGetTextState(TextClass * tclass, int state, int active, int sticky); -__EXPORT__ void TextstateTextFit(TextState * ts, char **ptext, int *pw, +void TextstateTextFit(TextState * ts, char **ptext, int *pw, int textwidth_limit); void TextstateTextDraw(TextState * ts, Win win, EX_Drawable draw, const char *text, @@ -113,9 +113,9 @@ void TextDraw(TextClass * tclass, Win win, EX_Drawable draw, const char *text, int x, int y, int w, int h, int fsize, int justification); -__EXPORT__ int _xft_FdcInit(TextState * ts, Win win, EX_Drawable draw); -__EXPORT__ void _xft_FdcFini(TextState * ts); -__EXPORT__ void _xft_FdcSetDrawable(TextState * ts, unsigned long draw); -__EXPORT__ void _xft_FdcSetColor(TextState * ts, unsigned int color); +int _xft_FdcInit(TextState * ts, Win win, EX_Drawable draw); +void _xft_FdcFini(TextState * ts); +void _xft_FdcSetDrawable(TextState * ts, unsigned long draw); +void _xft_FdcSetColor(TextState * ts, unsigned int color); #endif /* _TCLASS_H */ diff --git a/src/text.c b/src/text.c index 5092d02f..d726f5e9 100644 --- a/src/text.c +++ b/src/text.c @@ -1,6 +1,6 @@ /* * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors - * Copyright (C) 2004-2015 Kim Woelders + * Copyright (C) 2004-2021 Kim Woelders * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to @@ -823,7 +823,7 @@ TextSize(TextClass * tclass, int active, int sticky, int state, StrlistFree(lines, num_lines); } -void +__EXPORT__ void TextstateTextFit(TextState * ts, char **ptext, int *pw, int textwidth_limit) { if (ts->need_utf8 || MB_CUR_MAX > 1) diff --git a/src/text_xft.c b/src/text_xft.c index f01ca978..4ba7f7d1 100644 --- a/src/text_xft.c +++ b/src/text_xft.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2015 Kim Woelders + * Copyright (C) 2006-2021 Kim Woelders * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to @@ -117,7 +117,7 @@ _xft_TextDraw(TextState * ts, int x, int y, const char *text, int len) (const XftChar8 *)text, len); } -int +__EXPORT__ int _xft_FdcInit(TextState * ts, Win win, EX_Drawable draw) { FontCtxXft *fdc = (FontCtxXft *) ts->fdc; @@ -131,7 +131,7 @@ _xft_FdcInit(TextState * ts, Win win, EX_Drawable draw) return 0; } -void +__EXPORT__ void _xft_FdcFini(TextState * ts) { FontCtxXft *fdc = (FontCtxXft *) ts->fdc; @@ -139,7 +139,7 @@ _xft_FdcFini(TextState * ts) XftDrawDestroy(fdc->xftd); } -void +__EXPORT__ void _xft_FdcSetDrawable(TextState * ts, unsigned long draw) { FontCtxXft *fdc = (FontCtxXft *) ts->fdc; @@ -150,7 +150,7 @@ _xft_FdcSetDrawable(TextState * ts, unsigned long draw) XftDrawChange(fdc->xftd, draw); } -void +__EXPORT__ void _xft_FdcSetColor(TextState * ts, unsigned int color) { FontCtxXft *fdc = (FontCtxXft *) ts->fdc; diff --git a/src/util.h b/src/util.h index 23659b9e..2e1ed3c4 100644 --- a/src/util.h +++ b/src/util.h @@ -1,6 +1,6 @@ /* * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors - * Copyright (C) 2004-2019 Kim Woelders + * Copyright (C) 2004-2021 Kim Woelders * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to @@ -83,7 +83,7 @@ const char *Estrcasestr(const char *haystack, const char *needle); #define EMALLOC(type, num) (type*)Emalloc((num)*sizeof(type)) #define EREALLOC(type, ptr, num) (type*)Erealloc(ptr, (num)*sizeof(type)) -__EXPORT__ void EfreeNull(void **p); +void EfreeNull(void **p); void EfreeSet(void **p, void *s); void EfreeDup(char **p, const char *s); @@ -112,7 +112,7 @@ void StrlistSort(char **lst, int num); void Esetenv(const char *name, const char *value); /* misc.c */ -__EXPORT__ void __PRINTF__ Eprintf(const char *fmt, ...); +void __PRINTF__ Eprintf(const char *fmt, ...); #ifdef HAVE_SNPRINTF #define Evsnprintf vsnprintf diff --git a/src/x.c b/src/x.c index 1f90b5b8..8f0b40c3 100644 --- a/src/x.c +++ b/src/x.c @@ -1,6 +1,6 @@ /* * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors - * Copyright (C) 2004-2020 Kim Woelders + * Copyright (C) 2004-2021 Kim Woelders * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to @@ -49,8 +49,8 @@ #define DEBUG_XWIN 0 #define DEBUG_PIXMAP 0 -EDisplay Dpy; -Display *disp; +__EXPORT__ EDisplay Dpy; +__EXPORT__ Display *disp; #if USE_XRENDER static Visual *argb_visual = NULL; diff --git a/src/xwin.h b/src/xwin.h index 1272976d..6f24ae23 100644 --- a/src/xwin.h +++ b/src/xwin.h @@ -1,6 +1,6 @@ /* * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors - * Copyright (C) 2004-2015 Kim Woelders + * Copyright (C) 2004-2021 Kim Woelders * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to @@ -44,8 +44,8 @@ typedef struct { unsigned char last_error_code; } EDisplay; -__EXPORT__ extern EDisplay Dpy; -__EXPORT__ extern Display *disp; +extern EDisplay Dpy; +extern Display *disp; #define RROOT Dpy.rroot #define VROOT Dpy.vroot