From 7408198b5a57bfa32194c033a95b81dc637b0534 Mon Sep 17 00:00:00 2001
From: wk <wk@8a63c251-dffc-0310-8ec6-d64dca2275b1>
Date: Thu, 4 Jun 2009 14:19:21 +0000
Subject: [PATCH] Define SUN_LEN also for W32.

git-svn-id: svn://cvs.gnupg.org/gnupg/trunk@5034 8a63c251-dffc-0310-8ec6-d64dca2275b1
---
 artwork/gnupg-logo-new-single.svg | 125 ++++++++++++++++++++++++++++++++++++++
 jnlib/ChangeLog                   |   4 ++
 jnlib/mischelp.h                  |  12 ++--
 3 files changed, 137 insertions(+), 4 deletions(-)
 create mode 100644 artwork/gnupg-logo-new-single.svg

diff --git a/artwork/gnupg-logo-new-single.svg b/artwork/gnupg-logo-new-single.svg
new file mode 100644
index 00000000..7765948a
--- /dev/null
+++ b/artwork/gnupg-logo-new-single.svg
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Creator: CorelDRAW -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xml:space="preserve"
+   width="297mm"
+   height="210mm"
+   style="shape-rendering:geometricPrecision; text-rendering:geometricPrecision; image-rendering:optimizeQuality; fill-rule:evenodd; clip-rule:evenodd"
+   viewBox="0 0 297 210"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.46"
+   sodipodi:docname="gnupg-logo-new-single.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"><metadata
+   id="metadata53"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><sodipodi:namedview
+   inkscape:window-height="480"
+   inkscape:window-width="1148"
+   inkscape:pageshadow="2"
+   inkscape:pageopacity="0.0"
+   guidetolerance="10.0"
+   gridtolerance="10.0"
+   objecttolerance="10.0"
+   borderopacity="1.0"
+   bordercolor="#666666"
+   pagecolor="#ffffff"
+   id="base"
+   showgrid="false"
+   inkscape:zoom="0.33732275"
+   inkscape:cx="526.18109"
+   inkscape:cy="372.04724"
+   inkscape:window-x="650"
+   inkscape:window-y="347"
+   inkscape:current-layer="svg2" />
+ <defs
+   id="defs4"><inkscape:perspective
+   sodipodi:type="inkscape:persp3d"
+   inkscape:vp_x="0 : 372.04724 : 1"
+   inkscape:vp_y="0 : 1000 : 0"
+   inkscape:vp_z="1052.3622 : 372.04724 : 1"
+   inkscape:persp3d-origin="526.18109 : 248.03149 : 1"
+   id="perspective55" />
+  <font
+   id="FontID0"
+   font-variant="normal"
+   style="fill-rule:nonzero"
+   font-weight="400">
+	<font-face
+   font-family="CastleT"
+   id="font-face7">
+	</font-face>
+   <missing-glyph
+   id="missing-glyph9"><path
+     d="M0 0z"
+     id="path11" /></missing-glyph>
+   <glyph
+   unicode="G"
+   horiz-adv-x="647"
+   id="glyph13"><path
+     d="M567.332 640.168l0 -82.5004c-61.1653,41.6666 -121.666,62.4986 -181.665,62.4986 -65.0016,0 -117.669,-22.1653 -157.668,-66.4985 -25.0004,-27.667 -42.1672,-58.0006 -51.1656,-91.3329 -11.5015,-40.0012 -17.1667,-84.3343 -17.1667,-132.833 0,-99.8357 22.4999,-174.334 67.3312,-223.168 37.8352,-41.3345 87.5015,-62.0005 149.001,-62.0005 35.8328,0 70.1663,9.33303 103,27.9991l0 260.168c0,11.9996 -1.33329,22.6659 -3.83383,32.1675l115.999 0c-2.49806,-10.1682 -3.83135,-20.8345 -3.83135,-32.1675l0 -256.334c0.332083,-14.9983 2.49806,-28.3337 6.33189,-39.9987 -59.832,-19.6673 -103.499,-32.1675 -130.999,-37.6667 -27.501,-5.50168 -60.5011,-8.3343 -99.0005,-8.3343 -69.3336,0 -125.832,12.3342 -169.833,37.1661 -52.8335,29.5009 -92.3316,73.0014 -118.665,130.335 -23.1665,50.1644 -34.668,107.999 -34.668,173.333 0,116.333 36.1674,205.832 108.334,268.665 58.3327,51.1681 135.666,76.6667 232,76.6667 58.5012,0 120.668,-11.9996 186.5,-36.1649z"
+     id="path15" /></glyph>
+   <glyph
+   unicode="P"
+   horiz-adv-x="514"
+   id="glyph17"><path
+     d="M185.999 286.499l0 -254.331c0,-9.33303 1.66785,-20.1679 4.83504,-32.1675l-120.502 0c2.8351,10.1657 4.33443,20.8345 4.33443,32.1675l0 601.666c0,11.9996 -1.49933,22.8345 -4.33443,32.6656l213.334 0c52.0008,0 96.1679,-10.4978 132.333,-31.3323 55.334,-32.4996 83.001,-83.4992 83.001,-152.833 0,-76.8327 -33.6668,-132.167 -101,-166 -39.5006,-19.8333 -86.5003,-29.8355 -141.165,-29.8355l-70.8354 0zm0 51.3342l59.4999 0c32.6681,0 58.8333,5.83376 78.6666,17.5013 18.8346,11.499 33.8353,28.3312 44.8337,50.8336 11.1669,22.4999 16.6686,47.3318 16.6686,74.8328 0,42.1672 -11.6675,75.4994 -34.8341,99.8332 -23.3326,24.1653 -55.334,36.3334 -95.9994,36.3334l-68.8355 0 0 -279.334z"
+     id="path19" /></glyph>
+   <glyph
+   unicode="n"
+   horiz-adv-x="558"
+   id="glyph21"><path
+     d="M62.5011 520.501l103.999 0 0 -72.6668c15.6674,24.3313 31.3323,42.1647 47.3343,53.6662 29.999,20.832 67.8318,31.1663 113.833,31.1663 59.1654,0 104.165,-17.9994 134.667,-54.1668 19.4988,-23.1665 29.3324,-55.334 29.3324,-96.666l0 -349.667c0,-10.6663 1.33329,-21.5012 3.83383,-32.1675l-109.667 0c2.50054,8.16578 3.83383,18.8321 3.83383,32.1675l0 334.5c0,29.667 -8.66887,52.4989 -25.8356,68.833 -17.3328,16.1655 -41.9986,24.3338 -73.8316,24.3338 -39.6666,0 -69.6681,-11.0009 -89.8335,-33.1662 -21.1666,-23.3351 -31.8329,-53.5001 -31.8329,-90.1681l0 -304.332c0,-11.333 1.33329,-22.0018 3.83135,-32.1675l-109.664 0c2.49806,9.49907 3.83135,20.1679 3.83135,32.1675l0 456.667c0,10.9984 -1.33329,21.4987 -3.83135,31.6669z"
+     id="path23" /></glyph>
+   <glyph
+   unicode="u"
+   horiz-adv-x="555"
+   id="glyph25"><path
+     d="M388.667 0l0 71.3335c-18.5,-25.501 -36.4994,-43.6665 -53.6662,-54.8334 -27.3349,-17.1667 -61.8344,-25.8331 -103.166,-25.8331 -55.6661,0 -98.4999,15.8334 -128.333,47.3318 -24.8344,26.1677 -37.1686,63.6683 -37.1686,112.834l0 338.002c0,10.9984 -1.33329,21.4987 -3.83135,31.6669l109.664 0c-2.49806,-9.16699 -3.83135,-19.6673 -3.83135,-31.6669l0 -326.669c0,-27.9991 6.66645,-50.333 19.9994,-66.9991 17.6673,-21.1666 44.0011,-31.6669 79.1672,-31.6669 35.6668,0 64.3325,10.1657 86.3318,30.4996 22.0018,20.3339 33.0002,46.8337 33.0002,79.3333l0 315.502c0,11.333 -1.33329,21.8332 -3.83383,31.6669l109.667 0c-2.49806,-8.50035 -3.83135,-19.0006 -3.83135,-31.6669l0 -456.667c0,-10.3342 1.33329,-21.1666 3.83135,-32.1675l-103.999 0z"
+     id="path27" /></glyph>
+  </font>
+  <style
+   type="text/css"
+   id="style29">
+   
+    @font-face { font-family:&quot;CastleT&quot;;src:url(&quot;#FontID0&quot;) format(svg)}
+    .fil1 {fill:white}
+    .fil0 {fill:#0093DD}
+    .fnt1 {font-weight:normal;font-size:40.3513;font-family:'CastleT'}
+    .fnt0 {font-weight:normal;font-size:40.7083;font-family:'CastleT'}
+   
+  </style>
+ 
+  <metadata
+   id="CorelCorpID_0Corel-Layer" />
+  
+  
+  
+  
+  
+  
+  
+  
+  
+ </defs>
+ <g
+   id="g2498"
+   transform="translate(-57.729084,30.119522)"><path
+     class="fil0"
+     d="M 121.56,67.9212 L 124.3987,67.9212 L 124.3987,59.3763 C 124.3987,49.7972 132.1673,42.0286 141.7463,42.0286 C 151.3256,42.0286 159.0937,49.7972 159.0937,59.3763 L 159.0937,67.8368 C 159.0527,67.8655 159.0119,67.8936 158.9717,67.9212 L 158.972,67.9212 L 158.9456,67.939 L 158.9428,67.941 L 158.9402,67.9427 L 158.9374,67.9446 L 158.9243,67.9536 L 158.9088,67.9641 L 158.9058,67.9662 L 158.8888,67.9777 L 158.888,67.9783 L 158.8812,67.9828 L 158.8775,67.9853 L 158.869,67.991 L 158.8671,67.9923 L 158.8568,67.9992 L 158.8567,67.9992 L 158.8464,68.0062 L 158.8325,68.0155 L 158.8259,68.02 L 158.8203,68.0237 L 158.8156,68.0268 L 158.8,68.0374 L 158.7849,68.0473 L 158.7842,68.0478 L 158.7646,68.0608 L 158.7603,68.0636 L 158.7364,68.0793 L 158.7343,68.0807 L 158.7246,68.0872 L 158.7243,68.0874 L 158.7206,68.0898 L 158.6893,68.1103 L 158.6844,68.1135 L 158.6775,68.118 L 158.6744,68.1199 L 158.6722,68.1214 L 158.6561,68.1319 L 158.6546,68.1328 L 158.6542,68.1331 L 158.6532,68.1337 L 158.6348,68.1456 L 158.6309,68.1481 L 158.625,68.1519 L 158.6193,68.1554 L 158.6152,68.1581 L 158.6055,68.1644 L 158.5963,68.1702 L 158.5956,68.1705 L 158.586,68.1768 L 158.5849,68.1775 L 158.5762,68.1829 L 158.5735,68.1847 L 158.5666,68.1892 L 158.5621,68.192 L 158.5569,68.1952 L 158.5507,68.1991 L 158.5472,68.2013 L 158.4945,68.2344 L 158.4833,68.2412 L 158.4806,68.2429 L 158.4524,68.2604 L 158.4502,68.2618 L 158.4181,68.2813 L 158.4173,68.2818 L 158.4151,68.2832 L 158.4064,68.2884 L 158.4059,68.2887 L 158.3966,68.2943 L 158.3956,68.2949 L 158.3874,68.2998 L 158.3796,68.3046 L 158.3783,68.3053 L 158.374,68.3079 L 158.3601,68.3162 L 158.3526,68.3207 L 158.342,68.3271 L 158.311,68.3453 L 158.28,68.3635 L 158.2488,68.3818 L 158.2176,68.4002 L 158.1546,68.437 L 158.1229,68.4554 L 158.0911,68.474 L 158.0779,68.4816 L 157.9948,68.5296 L 157.9625,68.5482 L 157.9299,68.5668 L 157.8973,68.5856 L 157.8544,68.6101 L 157.7984,68.6418 L 157.7652,68.6606 L 157.6362,68.7331 L 157.6307,68.7361 L 157.5967,68.755 L 157.5627,68.7741 L 157.5551,68.7783 L 157.5098,68.8033 L 157.4081,68.8592 L 157.3603,68.8854 C 157.3115,68.9119 157.2622,68.9386 157.2124,68.9653 L 157.1997,68.9722 L 157.1765,68.9846 L 157.1041,69.0231 L 157.0677,69.0425 L 157.0616,69.0457 L 156.9947,69.081 L 156.9944,69.0812 L 156.9574,69.1005 L 156.9468,69.106 L 156.883,69.1394 L 156.8456,69.1588 L 156.8113,69.1765 C 156.7646,69.2007 156.7174,69.2249 156.6698,69.2491 L 156.6309,69.2689 C 156.575,69.2972 156.5185,69.3257 156.4614,69.3541 L 156.4609,69.3543 C 156.4064,69.3814 156.3514,69.4086 156.2958,69.4358 L 156.2406,69.4628 C 156.1802,69.4921 156.1193,69.5217 156.0576,69.5512 L 156.0573,69.5512 C 152.6123,71.1969 147.0875,72.9479 136.5993,73.7008 C 129.0858,74.2406 124.5309,77.5476 121.56,81.5386 L 121.56,67.9212 z M 132.3893,67.9212 L 151.1032,67.9212 L 151.1032,59.3763 C 151.1032,54.2092 146.9132,50.0192 141.7463,50.0192 C 136.5795,50.0192 132.3893,54.2092 132.3893,59.3763 L 132.3893,67.9212 z M 156.6309,69.2689 C 156.5749,69.2972 156.5186,69.3256 156.4614,69.3541 M 149.6048,46.2253 C 147.3802,44.896 144.7795,44.1312 142.0004,44.1312 C 134.3826,44.1312 128.1034,49.8707 127.2492,57.2596 C 129.4824,50.2728 136.0287,45.2117 143.7555,45.2117 C 145.808,45.2117 147.7773,45.5697 149.6048,46.2253 z M 161.9326,71.1919 L 161.9326,95.6772 L 127.3921,95.6772 C 131.1997,93.5602 134.0374,93.7758 138.7373,93.9244 C 145.1376,94.1268 152.2097,91.4456 155.6878,87.8954 C 159.1663,84.3448 155.373,87.0553 151.4354,88.0542 C 147.4972,89.0525 139.8769,89.1588 134.7832,87.8199 C 150.8262,88.0386 157.0699,82.849 160.6156,78.2013 C 164.1611,73.5537 159.0821,77.3944 155.7918,78.9966 C 152.5017,80.6003 146.7634,81.746 140.4535,80.9105 C 150.0047,80.8907 157.272,76.1177 161.9326,71.1919 z"
+     id="path37"
+     style="fill:#0093dd" /><text
+     x="165.241"
+     y="95.276199"
+     class="fil0 fnt1"
+     id="text50"
+     style="font-size:40.35129929px;font-weight:normal;fill:#0093dd;font-family:CastleT">GnuPG</text>
+</g>
+</svg>
\ No newline at end of file
diff --git a/jnlib/ChangeLog b/jnlib/ChangeLog
index b9984235..5f00f8eb 100644
--- a/jnlib/ChangeLog
+++ b/jnlib/ChangeLog
@@ -1,3 +1,7 @@
+2009-06-04  Werner Koch  <wk@g10code.com>
+
+	* mischelp.h: Include SUN_LEN etc also for W32.
+
 2009-05-19  Werner Koch  <wk@g10code.com>
 
 	* mischelp.h: Define PF_LOCAL, AF_LOCAL and SUN_LEN if requested.
diff --git a/jnlib/mischelp.h b/jnlib/mischelp.h
index 6bf7a917..e478354d 100644
--- a/jnlib/mischelp.h
+++ b/jnlib/mischelp.h
@@ -61,9 +61,13 @@ time_t timegm (struct tm *tm);
 
 
 /* Include hacks which are mainly required for Slowaris.  */
-#if defined(JNLIB_NEED_AFLOCAL) && !defined(HAVE_W32_SYSTEM)
-#include <sys/socket.h>
-#include <sys/un.h>
+#ifdef JNLIB_NEED_AFLOCAL
+#ifndef HAVE_W32_SYSTEM
+# include <sys/socket.h>
+# include <sys/un.h>
+#else
+# include <windows.h>
+#endif
 
 #ifndef PF_LOCAL
 # ifdef PF_UNIX
@@ -88,7 +92,7 @@ time_t timegm (struct tm *tm);
 # define SUN_LEN(ptr) ((size_t) (((struct sockaddr_un *) 0)->sun_path) \
 	               + strlen ((ptr)->sun_path))
 #endif /*SUN_LEN*/
-#endif /*JNLIB_NEED_AFLOCAL && !HAVE_W32_SYSTEM*/
+#endif /*JNLIB_NEED_AFLOCAL*/
 
 
 #endif /*LIBJNLIB_MISCHELP_H*/
-- 
2.11.4.GIT