--- Merging r23009 into '.':

C    packages/ptc/fpmake.pp
U    packages/ptc/src/ptc.pp
A    packages/ptc/src/x11/x11unikey.inc
A    packages/ptc/src/x11/x11includes.inc
A    packages/ptc/src/x11/x11check.inc
U    packages/ptc/src/x11/x11displayi.inc
A    packages/ptc/src/x11/x11glxfbconfigd.inc
A    packages/ptc/src/x11/x11extensions.inc
A    packages/ptc/src/x11/x11glxfbconfigi.inc
D    packages/ptc/src/x11/includes.inc
D    packages/ptc/src/x11/xunikey.inc
D    packages/ptc/src/x11/glxfbconfigd.inc
D    packages/ptc/src/x11/check.inc
D    packages/ptc/src/x11/extensions.inc
D    packages/ptc/src/x11/glxfbconfigi.inc
Summary of conflicts:
  Text conflicts: 1

# revisions: 23009
r23009 | nickysn | 2012-11-18 00:54:33 +0100 (Sun, 18 Nov 2012) | 1 line
Changed paths:
   M /trunk/packages/ptc/fpmake.pp
   M /trunk/packages/ptc/src/ptc.pp
   D /trunk/packages/ptc/src/x11/check.inc
   D /trunk/packages/ptc/src/x11/extensions.inc
   D /trunk/packages/ptc/src/x11/glxfbconfigd.inc
   D /trunk/packages/ptc/src/x11/glxfbconfigi.inc
   D /trunk/packages/ptc/src/x11/includes.inc
   A /trunk/packages/ptc/src/x11/x11check.inc (from /trunk/packages/ptc/src/x11/check.inc:23008)
   M /trunk/packages/ptc/src/x11/x11displayi.inc
   A /trunk/packages/ptc/src/x11/x11extensions.inc (from /trunk/packages/ptc/src/x11/extensions.inc:23008)
   A /trunk/packages/ptc/src/x11/x11glxfbconfigd.inc (from /trunk/packages/ptc/src/x11/glxfbconfigd.inc:23008)
   A /trunk/packages/ptc/src/x11/x11glxfbconfigi.inc (from /trunk/packages/ptc/src/x11/glxfbconfigi.inc:23008)
   A /trunk/packages/ptc/src/x11/x11includes.inc (from /trunk/packages/ptc/src/x11/includes.inc:23008)
   A /trunk/packages/ptc/src/x11/x11unikey.inc (from /trunk/packages/ptc/src/x11/xunikey.inc:23008)
   D /trunk/packages/ptc/src/x11/xunikey.inc

* ptcpas: prefix all x11 include files with 'x11'

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

.gitattributes

@@ -5976,11 +5976,7 @@ packages/ptc/src/wince/gdi/wincebitmapinfoi.inc svneol=native#text/plain
 packages/ptc/src/wince/gdi/wincegdiconsoled.inc svneol=native#text/plain
 packages/ptc/src/wince/gdi/wincegdiconsolei.inc svneol=native#text/plain
 packages/ptc/src/wince/includes.inc svneol=native#text/plain
-packages/ptc/src/x11/check.inc svneol=native#text/plain
-packages/ptc/src/x11/extensions.inc svneol=native#text/plain
-packages/ptc/src/x11/glxfbconfigd.inc svneol=native#text/plain
-packages/ptc/src/x11/glxfbconfigi.inc svneol=native#text/plain
-packages/ptc/src/x11/includes.inc svneol=native#text/plain
+packages/ptc/src/x11/x11check.inc svneol=native#text/plain
 packages/ptc/src/x11/x11consoled.inc svneol=native#text/plain
 packages/ptc/src/x11/x11consolei.inc svneol=native#text/plain
 packages/ptc/src/x11/x11dga1displayd.inc svneol=native#text/plain
@@ -5989,13 +5985,17 @@ packages/ptc/src/x11/x11dga2displayd.inc svneol=native#text/plain
 packages/ptc/src/x11/x11dga2displayi.inc svneol=native#text/plain
 packages/ptc/src/x11/x11displayd.inc svneol=native#text/plain
 packages/ptc/src/x11/x11displayi.inc svneol=native#text/plain
+packages/ptc/src/x11/x11extensions.inc svneol=native#text/plain
+packages/ptc/src/x11/x11glxfbconfigd.inc svneol=native#text/plain
+packages/ptc/src/x11/x11glxfbconfigi.inc svneol=native#text/plain
 packages/ptc/src/x11/x11imaged.inc svneol=native#text/plain
 packages/ptc/src/x11/x11imagei.inc svneol=native#text/plain
+packages/ptc/src/x11/x11includes.inc svneol=native#text/plain
 packages/ptc/src/x11/x11modesd.inc svneol=native#text/plain
 packages/ptc/src/x11/x11modesi.inc svneol=native#text/plain
+packages/ptc/src/x11/x11unikey.inc svneol=native#text/plain
 packages/ptc/src/x11/x11windowdisplayd.inc svneol=native#text/plain
 packages/ptc/src/x11/x11windowdisplayi.inc svneol=native#text/plain
-packages/ptc/src/x11/xunikey.inc svneol=native#text/plain
 packages/ptc/tests/convtest.pp svneol=native#text/plain
 packages/ptc/tests/endian.inc svneol=native#text/plain
 packages/ptc/tests/view.pp svneol=native#text/plain

packages/ptc/fpmake.pp

@@ -91,20 +91,26 @@ begin
       AddInclude('surfacei.inc');
       AddInclude('timerd.inc');
       AddInclude('timeri.inc');
-      AddInclude('includes.inc',allunixoses+[WinCE]);
-      AddInclude('extensions.inc',allunixoses);
-      AddInclude('x11modesd.inc',allunixoses);
-      AddInclude('x11imaged.inc',allunixoses);
-      AddInclude('x11displayd.inc',allunixoses);
-      AddInclude('x11windowdisplayd.inc',allunixoses);
+      AddInclude('includes.inc',[WinCE]);
+      AddInclude('x11check.inc',allunixoses);
+      AddInclude('x11consoled.inc',allunixoses);
+      AddInclude('x11consolei.inc',allunixoses);
       AddInclude('x11dga1displayd.inc',allunixoses);
+      AddInclude('x11dga1displayi.inc',allunixoses);
       AddInclude('x11dga2displayd.inc',allunixoses);
-      AddInclude('x11consoled.inc',allunixoses);
-      AddInclude('check.inc',allunixoses);
-      AddInclude('x11modesi.inc',allunixoses);
-      AddInclude('x11imagei.inc',allunixoses);
+      AddInclude('x11dga2displayi.inc',allunixoses);
+      AddInclude('x11displayd.inc',allunixoses);
       AddInclude('x11displayi.inc',allunixoses);
-      AddInclude('xunikey.inc',allunixoses);
+      AddInclude('x11extensions.inc',allunixoses);
+      AddInclude('x11glxfbconfigd.inc',allunixoses);
+      AddInclude('x11glxfbconfigi.inc',allunixoses);
+      AddInclude('x11imaged.inc',allunixoses);
+      AddInclude('x11imagei.inc',allunixoses);
+      AddInclude('x11includes.inc',allunixoses);
+      AddInclude('x11modesd.inc',allunixoses);
+      AddInclude('x11modesi.inc',allunixoses);
+      AddInclude('x11unikey.inc',allunixoses);
+      AddInclude('x11windowdisplayd.inc',allunixoses);
       AddInclude('x11windowdisplayi.inc',allunixoses);
       AddInclude('x11dga1displayi.inc',allunixoses);
       AddInclude('x11dga2displayi.inc',allunixoses);

packages/ptc/src/ptc.pp

@@ -39,7 +39,7 @@
 {$IFDEF UNIX}
 
   { X11 extensions we want to enable at compile time }
-  {$INCLUDE x11/extensions.inc}
+  {$INCLUDE x11/x11extensions.inc}
 
   {$IFDEF ENABLE_X11_EXTENSION_XF86DGA1}
     {$DEFINE ENABLE_X11_EXTENSION_XF86DGA}
@@ -232,7 +232,7 @@ end;
 {$ENDIF WinCE}
 
 {$IFDEF UNIX}
-{$INCLUDE x11/includes.inc}
+{$INCLUDE x11/x11includes.inc}
 {$ENDIF UNIX}
 
 {$INCLUDE core/consolei.inc}

packages/ptc/src/x11/x11displayi.inc

@@ -30,7 +30,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 }
 
-{$INCLUDE xunikey.inc}
+{$INCLUDE x11unikey.inc}
 
 constructor TX11Display.Create(ADisplay: PDisplay; AScreen: Integer; const AFlags: TX11Flags);
 begin

packages/ptc/src/x11/includes.inc → packages/ptc/src/x11/x11includes.inc

@@ -1,16 +1,16 @@
 {$INCLUDE x11modesd.inc}
 {$INCLUDE x11imaged.inc}
-{$INCLUDE glxfbconfigd.inc}
+{$INCLUDE x11glxfbconfigd.inc}
 {$INCLUDE x11displayd.inc}
 {$INCLUDE x11windowdisplayd.inc}
 {$INCLUDE x11dga1displayd.inc}
 {$INCLUDE x11dga2displayd.inc}
 {$INCLUDE x11consoled.inc}
 
-{$INCLUDE check.inc}
+{$INCLUDE x11check.inc}
 {$INCLUDE x11modesi.inc}
 {$INCLUDE x11imagei.inc}
-{$INCLUDE glxfbconfigi.inc}
+{$INCLUDE x11glxfbconfigi.inc}
 {$INCLUDE x11displayi.inc}
 {$INCLUDE x11windowdisplayi.inc}
 {$INCLUDE x11dga1displayi.inc}