Reorder header files. X11 headers need to be before freerdp/types.h otherwise we get warnings about redefinition of True and False

This commit is contained in:
Alan Pearson 2011-10-27 10:29:16 -07:00
parent 87bda74b81
commit 4735dcc5c7
5 changed files with 10 additions and 5 deletions

View File

@ -17,6 +17,9 @@
* limitations under the License.
*/
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include <freerdp/kbd/kbd.h>
#include <freerdp/kbd/vkcodes.h>

View File

@ -17,6 +17,9 @@
* limitations under the License.
*/
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include <freerdp/gdi/gdi.h>
#include <freerdp/codec/rfx.h>
#include <freerdp/codec/nsc.h>
@ -563,7 +566,7 @@ void xf_gdi_polyline(rdpUpdate* update, POLYLINE_ORDER* polyline)
x = (x2 < x1) ? x2 : x1;
width = (x2 > x1) ? x2 - x1 : x1 - x2;
y = (y2 < y1) ? y2 : y1;
height = (y2 > y1) ? y2 - y1 : y1 - y2;

View File

@ -20,8 +20,6 @@
#ifndef __XF_GDI_H
#define __XF_GDI_H
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include <freerdp/gdi/gdi.h>
#include "xfreerdp.h"

View File

@ -17,6 +17,9 @@
* limitations under the License.
*/
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include <freerdp/utils/event.h>
#include <freerdp/utils/hexdump.h>
#include <freerdp/utils/rail.h>

View File

@ -20,8 +20,6 @@
#ifndef __XFREERDP_H
#define __XFREERDP_H
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include <freerdp/freerdp.h>
#include <freerdp/channels/channels.h>
#include <freerdp/gdi/gdi.h>