diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2015-04-16 18:03:18 +0200 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2015-04-16 18:03:18 +0200 |
| commit | cfc0202b42ad307391202ca776937b28ea7d2b03 (patch) | |
| tree | 03acc5d7d7bb0d35152bfc597eb788b938f09647 /nx-X11/programs/Xserver/hw/nxagent/NXcompositeext.h | |
| parent | fad840cfe558601a8ec02414f1235824bc9f3168 (diff) | |
| parent | a5f71f084e9f32e947a04da69edb7aae96d61697 (diff) | |
| download | nx-libs-cfc0202b42ad307391202ca776937b28ea7d2b03.tar.gz nx-libs-cfc0202b42ad307391202ca776937b28ea7d2b03.tar.bz2 nx-libs-cfc0202b42ad307391202ca776937b28ea7d2b03.zip | |
Merge branch 'sunweaver-pr/nxupgradeagent-cleanup' into arctica-3.6.x
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/NXcompositeext.h')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/NXcompositeext.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXcompositeext.h b/nx-X11/programs/Xserver/hw/nxagent/NXcompositeext.h index a22335153..8667ded16 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXcompositeext.h +++ b/nx-X11/programs/Xserver/hw/nxagent/NXcompositeext.h @@ -1,5 +1,3 @@ -#ifndef NXAGENT_UPGRADE - /* * $Id: composite.h,v 1.4 2004/07/08 07:20:55 keithp Exp $ * @@ -51,5 +49,3 @@ #define CompositeNumberRequests (X_CompositeNameWindowPixmap + 1) #endif /* _COMPOSITE_H_ */ - -#endif /* #ifndef NXAGENT_UPGRADE */ |