--- Merging r24211 into '.':

A    packages/cairo/examples/getversion.pp
U    packages/cairo/src/cairo.pp
--- Merging r23542 into '.':
U    rtl/nativent/sysfile.inc
U    rtl/win/sysfile.inc
Skipped 'tests/webtbs/tw23725.pp'
Summary of conflicts:
  Skipped paths: 1

# revisions: 24211,23542
r24211 | florian | 2013-04-09 09:34:26 +0200 (Tue, 09 Apr 2013) | 2 lines
Changed paths:
   A /trunk/packages/cairo/examples/getversion.pp
   M /trunk/packages/cairo/src/cairo.pp

+ simple example for cairo
* fix cairo for win64
r23542 | florian | 2013-01-29 22:26:17 +0100 (Tue, 29 Jan 2013) | 1 line
Changed paths:
   M /trunk/rtl/nativent/sysfile.inc
   M /trunk/rtl/win/sysfile.inc
   A /trunk/tests/webtbs/tw23725.pp

* patch by Serg Bormant: fix fmShareCompat handling for win32/win64/nativent, resolves #23725

git-svn-id: branches/fixes_2_6@25186 -

.gitattributes

@@ -963,6 +963,7 @@ packages/bzip2/src/bzip2si386.inc svneol=native#text/plain
 packages/bzip2/src/bzip2stream.pp svneol=native#text/plain
 packages/cairo/Makefile svneol=native#text/plain
 packages/cairo/Makefile.fpc svneol=native#text/plain
+packages/cairo/examples/getversion.pp svneol=native#text/pascal
 packages/cairo/fpmake.pp svneol=native#text/plain
 packages/cairo/src/cairo.pp svneol=native#text/plain
 packages/cairo/src/cairoft.pp svneol=native#text/plain

packages/cairo/examples/getversion.pp

@@ -0,0 +1,10 @@
+uses
+  cairo;
+
+var
+  major, minor, micro: LongInt;
+
+begin
+  cairo_version(major, minor, micro);
+  writeln(major,'.',minor,'.',micro);
+end.

packages/cairo/src/cairo.pp

@@ -56,7 +56,7 @@ Uses
   CTypes;
 
 const
-{$ifdef win32}
+{$ifdef MSWINDOWS}
   LIB_CAIRO = 'libcairo-2.dll';
   {$IFDEF FPC}
     {$ifndef NO_SMART_LINK}

rtl/nativent/sysfile.inc

@@ -329,7 +329,7 @@ begin
   if ((filemode and fmshareExclusive) = fmshareExclusive) then
     { no sharing }
   else
-    if (filemode = fmShareCompat) or ((filemode and fmshareDenyWrite) = fmshareDenyWrite) then
+    if ((filemode and $F0) = fmShareCompat) or ((filemode and fmshareDenyWrite) = fmshareDenyWrite) then
       shflags := FILE_SHARE_READ
   else
     if ((filemode and fmshareDenyRead) = fmshareDenyRead) then

rtl/win/sysfile.inc

@@ -230,7 +230,7 @@ begin
   if ((filemode and fmshareExclusive) = fmshareExclusive) then
     { no sharing }
   else
-    if (filemode = fmShareCompat) or ((filemode and fmshareDenyWrite) = fmshareDenyWrite) then
+    if ((filemode and $f0) = fmShareCompat) or ((filemode and fmshareDenyWrite) = fmshareDenyWrite) then
       shflags := file_Share_Read
   else
     if ((filemode and fmshareDenyRead) = fmshareDenyRead) then