diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-06-27 11:51:31 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-07-02 14:05:31 +0200 |
| commit | ce40aec08aef6aebd1d25728a1d0dc4b2bc8db09 (patch) | |
| tree | 35762983db2c3e9f0b2fec6501b77ec2d55a7fa4 /doc/nx-X11_vs_XOrg69_patches | |
| parent | 74a5450bc058354e55c1589e64ef8e73775cebc4 (diff) | |
| download | nx-libs-ce40aec08aef6aebd1d25728a1d0dc4b2bc8db09.tar.gz nx-libs-ce40aec08aef6aebd1d25728a1d0dc4b2bc8db09.tar.bz2 nx-libs-ce40aec08aef6aebd1d25728a1d0dc4b2bc8db09.zip | |
nx-X11/programs/Xserver: Drop {X,x}calloc() macros, use calloc() instead.
Diffstat (limited to 'doc/nx-X11_vs_XOrg69_patches')
| -rw-r--r-- | doc/nx-X11_vs_XOrg69_patches/nx-X11_lib_xtrans_Xtranssock.c.X.original | 2 | ||||
| -rw-r--r-- | doc/nx-X11_vs_XOrg69_patches/randr.NX.diff | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/nx-X11_vs_XOrg69_patches/nx-X11_lib_xtrans_Xtranssock.c.X.original b/doc/nx-X11_vs_XOrg69_patches/nx-X11_lib_xtrans_Xtranssock.c.X.original index fc81419d7..e076269f7 100644 --- a/doc/nx-X11_vs_XOrg69_patches/nx-X11_lib_xtrans_Xtranssock.c.X.original +++ b/doc/nx-X11_vs_XOrg69_patches/nx-X11_lib_xtrans_Xtranssock.c.X.original @@ -312,7 +312,7 @@ + fprintf(stderr, "SocketCreateConnInfo: Going to create the NX connection info.\n"); +#endif + -+ if ((ciptr = (XtransConnInfo) xcalloc (1, sizeof(struct _XtransConnInfo))) == NULL) ++ if ((ciptr = (XtransConnInfo) calloc (1, sizeof(struct _XtransConnInfo))) == NULL) + { + PRMSG (1, "SocketCreateConnInfo: malloc failed\n", 0, 0, 0); + return NULL; diff --git a/doc/nx-X11_vs_XOrg69_patches/randr.NX.diff b/doc/nx-X11_vs_XOrg69_patches/randr.NX.diff index 6462b1176..835577944 100644 --- a/doc/nx-X11_vs_XOrg69_patches/randr.NX.diff +++ b/doc/nx-X11_vs_XOrg69_patches/randr.NX.diff @@ -565,7 +565,7 @@ diff -u ./nx-X11/programs/Xserver/randr.X.original/randr.c ./nx-X11/programs/Xse + return FALSE; - pScrPriv = (rrScrPrivPtr) xalloc (sizeof (rrScrPrivRec)); -+ pScrPriv = (rrScrPrivPtr) xcalloc (1, sizeof (rrScrPrivRec)); ++ pScrPriv = (rrScrPrivPtr) calloc (1, sizeof (rrScrPrivRec)); if (!pScrPriv) return FALSE; |