From 241e451e32ccb4a90acdecc5c778a3117c4ed739 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Fri, 21 Aug 2015 09:35:02 +0000 Subject: texk/dvipdfm-x: Drop 'CDECL' and use 'static inline' git-svn-id: svn://tug.org/texlive/trunk@38171 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/dvipdfm-x/ChangeLog | 8 ++++++++ Build/source/texk/dvipdfm-x/agl.c | 2 +- Build/source/texk/dvipdfm-x/dvipdfmx.c | 2 +- Build/source/texk/dvipdfm-x/otl_opt.c | 4 ++-- Build/source/texk/dvipdfm-x/pdfencoding.c | 2 +- Build/source/texk/dvipdfm-x/pdfnames.c | 4 ++-- Build/source/texk/dvipdfm-x/pdfobj.c | 2 +- Build/source/texk/dvipdfm-x/system.h | 5 ----- Build/source/texk/dvipdfm-x/t1_char.c | 2 +- Build/source/texk/dvipdfm-x/tt_cmap.c | 2 +- Build/source/texk/dvipdfm-x/tt_glyf.c | 2 +- 11 files changed, 19 insertions(+), 16 deletions(-) diff --git a/Build/source/texk/dvipdfm-x/ChangeLog b/Build/source/texk/dvipdfm-x/ChangeLog index 26641e1f110..619849235c9 100644 --- a/Build/source/texk/dvipdfm-x/ChangeLog +++ b/Build/source/texk/dvipdfm-x/ChangeLog @@ -1,3 +1,11 @@ +2015-08-21 Peter Breitenlohner + + * dvipdfmx.c (main): Drop CDECL. + * agl.c, otl_opt.c, pdfencoding.c, pdfnames.c, pdfobj.c, + t1_char.c, tt_cmap.c, tt_glyf.c: + Replace 'static CDECL' => 'static inline '. + * system.h: Drop __cdecl and CDECL. + 2015-08-14 Peter Breitenlohner * pdfcolor.[ch]: Drop unused pdf_color_set_default(). diff --git a/Build/source/texk/dvipdfm-x/agl.c b/Build/source/texk/dvipdfm-x/agl.c index 3f1cc52731c..f2a65a89985 100644 --- a/Build/source/texk/dvipdfm-x/agl.c +++ b/Build/source/texk/dvipdfm-x/agl.c @@ -364,7 +364,7 @@ agl_normalized_name (char *glyphname) static struct ht_table aglmap; -static void CDECL +static inline void hval_free (void *hval) { agl_release_name((struct agl_name *) hval); diff --git a/Build/source/texk/dvipdfm-x/dvipdfmx.c b/Build/source/texk/dvipdfm-x/dvipdfmx.c index d2eae7731e8..38368b4a01a 100644 --- a/Build/source/texk/dvipdfm-x/dvipdfmx.c +++ b/Build/source/texk/dvipdfm-x/dvipdfmx.c @@ -876,7 +876,7 @@ int #if defined(DLLPROC) DLLPROC (int argc, char *argv[]) #else -CDECL main (int argc, char *argv[]) +main (int argc, char *argv[]) #endif { double dvi2pts; diff --git a/Build/source/texk/dvipdfm-x/otl_opt.c b/Build/source/texk/dvipdfm-x/otl_opt.c index 38ed5b0562a..fa13df0993d 100644 --- a/Build/source/texk/dvipdfm-x/otl_opt.c +++ b/Build/source/texk/dvipdfm-x/otl_opt.c @@ -246,7 +246,7 @@ struct uc_coverage struct lv_range *ranges; }; -static int CDECL +static inline int range_cmp (const void *v1, const void *v2) { struct lv_range *sv1, *sv2; @@ -262,7 +262,7 @@ range_cmp (const void *v1, const void *v2) return 0; } -static int CDECL +static inline int range_overlap (const void *v1, const void *v2) { struct lv_range *sv1, *sv2; diff --git a/Build/source/texk/dvipdfm-x/pdfencoding.c b/Build/source/texk/dvipdfm-x/pdfencoding.c index c7bc2722f56..d8fb0537114 100644 --- a/Build/source/texk/dvipdfm-x/pdfencoding.c +++ b/Build/source/texk/dvipdfm-x/pdfencoding.c @@ -201,7 +201,7 @@ pdf_clean_encoding_struct (pdf_encoding *encoding) } #if 0 -static int CDECL +static inline int glycmp (const void *pv1, const void *pv2) { char *v1, *v2; diff --git a/Build/source/texk/dvipdfm-x/pdfnames.c b/Build/source/texk/dvipdfm-x/pdfnames.c index e8062fe6e3e..3d5063576c3 100644 --- a/Build/source/texk/dvipdfm-x/pdfnames.c +++ b/Build/source/texk/dvipdfm-x/pdfnames.c @@ -73,7 +73,7 @@ printable_key (const char *key, int keylen) return (char *) pkey; } -static void CDECL +static inline void hval_free (void *hval) { struct obj_data *value; @@ -249,7 +249,7 @@ struct named_object pdf_obj *value; }; -static int CDECL +static inline int cmp_key (const void *d1, const void *d2) { const struct named_object *sd1, *sd2; diff --git a/Build/source/texk/dvipdfm-x/pdfobj.c b/Build/source/texk/dvipdfm-x/pdfobj.c index 9db06c539db..d9b46e01fc3 100644 --- a/Build/source/texk/dvipdfm-x/pdfobj.c +++ b/Build/source/texk/dvipdfm-x/pdfobj.c @@ -3332,7 +3332,7 @@ check_for_pdf (FILE *file) return 1; } -static int CDECL +static inline int import_dict (pdf_obj *key, pdf_obj *value, void *pdata) { pdf_obj *copy; diff --git a/Build/source/texk/dvipdfm-x/system.h b/Build/source/texk/dvipdfm-x/system.h index 3e65c2fd243..b43625b1385 100644 --- a/Build/source/texk/dvipdfm-x/system.h +++ b/Build/source/texk/dvipdfm-x/system.h @@ -40,11 +40,6 @@ # undef SETLINEJOIN # undef SETMITERLIMIT # pragma warning(disable : 4101 4018) -#else -# ifndef __cdecl -# define __cdecl -# endif -# define CDECL #endif /* WIN32 */ #endif /* _SYSTEM_H_ */ diff --git a/Build/source/texk/dvipdfm-x/t1_char.c b/Build/source/texk/dvipdfm-x/t1_char.c index 9db2ce35a3b..68723801cc1 100644 --- a/Build/source/texk/dvipdfm-x/t1_char.c +++ b/Build/source/texk/dvipdfm-x/t1_char.c @@ -259,7 +259,7 @@ static double ps_arg_stack[PS_ARG_STACK_MAX]; * Convert ghost hint to edge hint, Counter control for hstem3/vstem3. */ -static int CDECL +static inline int stem_compare (const void *v1, const void *v2) { int cmp = 0; diff --git a/Build/source/texk/dvipdfm-x/tt_cmap.c b/Build/source/texk/dvipdfm-x/tt_cmap.c index 8a8d9ec52d9..e760a7c082a 100644 --- a/Build/source/texk/dvipdfm-x/tt_cmap.c +++ b/Build/source/texk/dvipdfm-x/tt_cmap.c @@ -1743,7 +1743,7 @@ handle_gsub (pdf_obj *conf, } -static void CDECL +static inline void hval_free (void *hval) { RELEASE(hval); diff --git a/Build/source/texk/dvipdfm-x/tt_glyf.c b/Build/source/texk/dvipdfm-x/tt_glyf.c index 89aec5dae7e..da3ec6be550 100644 --- a/Build/source/texk/dvipdfm-x/tt_glyf.c +++ b/Build/source/texk/dvipdfm-x/tt_glyf.c @@ -163,7 +163,7 @@ tt_build_finish (struct tt_glyphs *g) } } -static int CDECL +static inline int glyf_cmp (const void *v1, const void *v2) { int cmp = 0; -- cgit v1.2.3