diff options
author | jsorg71 <jay.sorg@gmail.com> | 2013-08-16 12:13:52 -0700 |
---|---|---|
committer | jsorg71 <jay.sorg@gmail.com> | 2013-08-16 12:13:52 -0700 |
commit | b8388a65a2d561c23cc08613d1c4d7cf5dbb96d0 (patch) | |
tree | 6d606a46f9d52dd7945b88566818704e226e013a /xorg/server/module/rdpPutImage.c | |
parent | 759d508635a742690aebcf07d4d9dfa2c08beda9 (diff) | |
parent | fa40106a697611a35b57459c9403cc440a0cc865 (diff) | |
download | xrdp-proprietary-b8388a65a2d561c23cc08613d1c4d7cf5dbb96d0.tar.gz xrdp-proprietary-b8388a65a2d561c23cc08613d1c4d7cf5dbb96d0.zip |
Merge pull request #90 from neutrinolabs/master
xorg driver, smart card, etc
Diffstat (limited to 'xorg/server/module/rdpPutImage.c')
-rw-r--r-- | xorg/server/module/rdpPutImage.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/xorg/server/module/rdpPutImage.c b/xorg/server/module/rdpPutImage.c index 2d9faa89..f7a33f7c 100644 --- a/xorg/server/module/rdpPutImage.c +++ b/xorg/server/module/rdpPutImage.c @@ -19,6 +19,17 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#include <stdio.h> +#include <stdlib.h> +#include <string.h> + +/* this should be before all X11 .h files */ +#include <xorg-server.h> + +/* all driver need this */ +#include <xf86.h> +#include <xf86_OSproc.h> + #include "rdp.h" #include "rdpDraw.h" @@ -31,8 +42,7 @@ static void rdpPutImageOrg(DrawablePtr pDst, GCPtr pGC, int depth, int x, int y, int w, int h, int leftPad, int format, char *pBits) { - rdpGCPtr priv; - GCFuncs *oldFuncs; + GC_OP_VARS; GC_OP_PROLOGUE(pGC); pGC->ops->PutImage(pDst, pGC, depth, x, y, w, h, leftPad, |