Mercurial Mercurial > sustaining > oi_151a > spec-files / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patches/metacity-08-pretty-function.diff
author dcarbery
Fri, 24 Nov 2006 16:37:59 +0000
branch217update
changeset 19096 d542fc2c823e
parent 8381 ca5944f92ddc
permissions -rw-r--r--
Merged trunk changes r9797:9829 into 217update branch.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
8381
ca5944f92ddc 2006-10-20 Erwann Chenede - <[email protected]>
erwannc
parents: 6617
diff changeset 
     1
 
diff -Nrup metacity-2.16.3/src/window-props.c ../SUNWgnome-wm-2.16.1/metacity-2.16.3/src/window-props.c
ca5944f92ddc 2006-10-20 Erwann Chenede - <[email protected]>
erwannc
parents: 6617
diff changeset 
     2
 
--- metacity-2.16.3/src/window-props.c	2006-10-20 15:06:26.428699000 +0200
ca5944f92ddc 2006-10-20 Erwann Chenede - <[email protected]>
erwannc
parents: 6617
diff changeset 
     3
 
+++ ../SUNWgnome-wm-2.16.1/metacity-2.16.3/src/window-props.c	2006-10-20 15:06:39.493632000 +0200
ca5944f92ddc 2006-10-20 Erwann Chenede - <[email protected]>
erwannc
parents: 6617
diff changeset 
     4
 
@@ -28,6 +28,12 @@
6560
6fee312bfb75 * patches/metacity-08-pretty-function.diff: Use G_STRFUNC for
dc144907
parents: 6539
diff changeset 
     5
 
 #include "group.h"
6fee312bfb75 * patches/metacity-08-pretty-function.diff: Use G_STRFUNC for
dc144907
parents: 6539
diff changeset 
     6
 
 #include <X11/Xatom.h>
6fee312bfb75 * patches/metacity-08-pretty-function.diff: Use G_STRFUNC for
dc144907
parents: 6539
diff changeset 
     7
 
 #include <unistd.h>
6fee312bfb75 * patches/metacity-08-pretty-function.diff: Use G_STRFUNC for
dc144907
parents: 6539
diff changeset 
     8
 
+/* Include netdb.h for Solaris for MAXHOSTNAMELEN. */
6fee312bfb75 * patches/metacity-08-pretty-function.diff: Use G_STRFUNC for
dc144907
parents: 6539
diff changeset 
     9
 
+/* For use with gethostname(). */
6fee312bfb75 * patches/metacity-08-pretty-function.diff: Use G_STRFUNC for
dc144907
parents: 6539
diff changeset 
    10
 
+#include <netdb.h>
6fee312bfb75 * patches/metacity-08-pretty-function.diff: Use G_STRFUNC for
dc144907
parents: 6539
diff changeset 
    11
 
+#ifndef HOST_NAME_MAX
6fee312bfb75 * patches/metacity-08-pretty-function.diff: Use G_STRFUNC for
dc144907
parents: 6539
diff changeset 
    12
 
+#define HOST_NAME_MAX MAXHOSTNAMELEN
6fee312bfb75 * patches/metacity-08-pretty-function.diff: Use G_STRFUNC for
dc144907
parents: 6539
diff changeset 
    13
 
+#endif
6fee312bfb75 * patches/metacity-08-pretty-function.diff: Use G_STRFUNC for
dc144907
parents: 6539
diff changeset 
    14
 
 #include <string.h>
8381
ca5944f92ddc 2006-10-20 Erwann Chenede - <[email protected]>
erwannc
parents: 6617
diff changeset 
    15
 
 #ifndef HOST_NAME_MAX
ca5944f92ddc 2006-10-20 Erwann Chenede - <[email protected]>
erwannc
parents: 6617
diff changeset 
    16
 
 /* Solaris headers apparently don't define this so do so manually; #326745 */
sustaining/oi_151a/spec-files