diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2013-01-10 09:16:11 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2013-01-10 09:16:11 +0000 |
commit | efbf5bbc4445a501d5bb3e6544255a0e1cf689a7 (patch) | |
tree | 48fe61928ae5117ad64b9016742a35e7156656f2 /Build/source/texk | |
parent | 1e61866dd8749c9d3bc594cbab333238c52c7eee (diff) |
(x)dvipdfmx: Avoid casts (const char *) -> (char *)
git-svn-id: svn://tug.org/texlive/trunk@28784 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk')
-rw-r--r-- | Build/source/texk/dvipdfmx/ChangeLog | 4 | ||||
-rw-r--r-- | Build/source/texk/dvipdfmx/src/cid.c | 12 | ||||
-rw-r--r-- | Build/source/texk/xdvipdfmx/ChangeLog | 20 | ||||
-rw-r--r-- | Build/source/texk/xdvipdfmx/src/cid.c | 12 |
4 files changed, 32 insertions, 16 deletions
diff --git a/Build/source/texk/dvipdfmx/ChangeLog b/Build/source/texk/dvipdfmx/ChangeLog index 156fdb72ae9..5fe4b753127 100644 --- a/Build/source/texk/dvipdfmx/ChangeLog +++ b/Build/source/texk/dvipdfmx/ChangeLog @@ -1,3 +1,7 @@ +2013-01-10 Peter Breitenlohner <peb@mppmu.mpg.de> + + * src/cid.c: Avoid casts (const char *) -> (char *). + 2013-01-09 Peter Breitenlohner <peb@mppmu.mpg.de> Avoid various gcc-4.6 warnings. diff --git a/Build/source/texk/dvipdfmx/src/cid.c b/Build/source/texk/dvipdfmx/src/cid.c index 0359fb8986a..f38d1631645 100644 --- a/Build/source/texk/dvipdfmx/src/cid.c +++ b/Build/source/texk/dvipdfmx/src/cid.c @@ -76,15 +76,19 @@ static struct { #define ACC_START 1 #define ACC_END 4 +static char registry_Adobe[] = "Adobe"; +static char ordering_Identity[] = "Identity"; +static char ordering_UCS[] = "UCS"; + CIDSysInfo CSI_IDENTITY = { - (char *) "Adobe", - (char *) "Identity", + registry_Adobe, + ordering_Identity, 0 }; CIDSysInfo CSI_UNICODE = { - (char *) "Adobe", - (char *) "UCS", + registry_Adobe, + ordering_UCS, 0 }; diff --git a/Build/source/texk/xdvipdfmx/ChangeLog b/Build/source/texk/xdvipdfmx/ChangeLog index f61401117b3..ae781d4a93b 100644 --- a/Build/source/texk/xdvipdfmx/ChangeLog +++ b/Build/source/texk/xdvipdfmx/ChangeLog @@ -1,3 +1,7 @@ +2013-01-10 Peter Breitenlohner <peb@mppmu.mpg.de> + + * src/cid.c: Avoid casts (const char *) -> (char *). + 2013-01-09 Peter Breitenlohner <peb@mppmu.mpg.de> Avoid various gcc-4.6 warnings. @@ -65,16 +69,16 @@ 2012-08-31 Peter Breitenlohner <peb@mppmu.mpg.de> Reduce TL/W32TeX diffs. - * cidtype0.c, cidtype2.c, cmap_write.c, mpost.c, truetype.c, - tt_cmap.c, tt_gsub.c, tt_post.c: Cast function args to avoid - WIN32 (MSVC) warnings. - * pdfencrypt.c (getpass) [WIN32]: Use "*" to `echo' password. - * pdfobj.c (pdf_out_xchar): Reformulate to avoid MSVC warnings. - * dvipdfmx.c (main) [WIN32]: Call texlive_gs_init(). - * dvi.c (dvi_init): Fix logic for appending ".dvi" or ".xdv". + * src/cidtype0.c, src/cidtype2.c, src/cmap_write.c, src/mpost.c, + src/truetype.c, src/tt_cmap.c, src/tt_gsub.c, src/tt_post.c: + Cast function args to avoid WIN32 (MSVC) warnings. + * src/pdfencrypt.c (getpass) [WIN32]: Use "*" to `echo' password. + * src/pdfobj.c (pdf_out_xchar): Reformulate to avoid MSVC warnings. + * src/dvipdfmx.c (main) [WIN32]: Call texlive_gs_init(). + * src/dvi.c (dvi_init): Fix logic for appending ".dvi" or ".xdv". * spc_dvips.c: Use binary mode for all file io. [WIN32]: Use gswin32c; avoid memory leak. - * xbb.c (show_usage): Correctly report .bb or .xbb as default. + * src/xbb.c (show_usage): Correctly report .bb or .xbb as default. 2012-08-26 Khaled Hosny <khaledhosny@eglug.org> diff --git a/Build/source/texk/xdvipdfmx/src/cid.c b/Build/source/texk/xdvipdfmx/src/cid.c index c3935d73e44..c1ccbaf0585 100644 --- a/Build/source/texk/xdvipdfmx/src/cid.c +++ b/Build/source/texk/xdvipdfmx/src/cid.c @@ -76,15 +76,19 @@ static struct { #define ACC_START 1 #define ACC_END 4 +static char registry_Adobe[] = "Adobe"; +static char ordering_Identity[] = "Identity"; +static char ordering_UCS[] = "UCS"; + CIDSysInfo CSI_IDENTITY = { - (char *) "Adobe", - (char *) "Identity", + registry_Adobe, + ordering_Identity, 0 }; CIDSysInfo CSI_UNICODE = { - (char *) "Adobe", - (char *) "UCS", + registry_Adobe, + ordering_UCS, 0 }; |