Merge remote-tracking branch 'origin/released'

Conflicts:
	mesalib/src/glsl/.gitignore
	xorg-server/Xext/panoramiX.c
	xorg-server/hw/xwin/win.h
	xorg-server/hw/xwin/winclipboardinit.c
	xorg-server/hw/xwin/winclipboardthread.c
	xorg-server/hw/xwin/winclipboardunicode.c
	xorg-server/hw/xwin/winclipboardwrappers.c
	xorg-server/hw/xwin/winclipboardxevents.c
	xorg-server/hw/xwin/wincreatewnd.c
	xorg-server/hw/xwin/windialogs.c
	xorg-server/hw/xwin/winerror.c
	xorg-server/hw/xwin/winmonitors.c
	xorg-server/hw/xwin/winmultiwindowwm.c
	xorg-server/hw/xwin/winprocarg.c
	xorg-server/hw/xwin/winwndproc.c

2 files changed, 23 insertions, 19 deletions

diff --git a/xorg-server/include/extinit.h b/xorg-server/include/extinit.h
index 0a24db068..6c5337fc2 100644
--- a/xorg-server/include/extinit.h
+++ b/xorg-server/include/extinit.h
@@ -54,17 +54,17 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "extnsionst.h"
 
 #ifdef COMPOSITE
-extern Bool noCompositeExtension;
+extern _X_EXPORT Bool noCompositeExtension;
 extern void CompositeExtensionInit(void);
 #endif
 
 #ifdef DAMAGE
-extern Bool noDamageExtension;
+extern _X_EXPORT Bool noDamageExtension;
 extern void DamageExtensionInit(void);
 #endif
 
 #if defined(DBE)
-extern Bool noDbeExtension;
+extern _X_EXPORT Bool noDbeExtension;
 extern void DbeExtensionInit(void);
 #endif
 
@@ -74,7 +74,7 @@ extern void DMXExtensionInit(void);
 
 #if defined(DPMSExtension)
 #include <X11/extensions/dpmsconst.h>
-extern Bool noDPMSExtension;
+extern _X_EXPORT Bool noDPMSExtension;
 extern void DPMSExtensionInit(void);
 #endif
 
@@ -88,12 +88,12 @@ extern void GlxExtensionInit(void);
 
 #ifdef PANORAMIX
 #include <X11/extensions/panoramiXproto.h>
-extern Bool noPanoramiXExtension;
+extern _X_EXPORT Bool noPanoramiXExtension;
 extern void PanoramiXExtensionInit(void);
 #endif
 
 #ifdef RANDR
-extern Bool noRRExtension;
+extern _X_EXPORT Bool noRRExtension;
 extern void RRExtensionInit(void);
 #endif
 
@@ -101,18 +101,18 @@ extern void RRExtensionInit(void);
 extern void RecordExtensionInit(void);
 #endif
 
-extern Bool noRenderExtension;
+extern _X_EXPORT Bool noRenderExtension;
 extern void RenderExtensionInit(void);
 
 #if defined(RES)
 #include <X11/extensions/XResproto.h>
-extern Bool noResExtension;
+extern _X_EXPORT Bool noResExtension;
 extern void ResExtensionInit(void);
 #endif
 
 #if defined(SCREENSAVER)
 #include <X11/extensions/saver.h>
-extern Bool noScreenSaverExtension;
+extern _X_EXPORT Bool noScreenSaverExtension;
 extern void ScreenSaverExtensionInit(void);
 #endif
 
@@ -122,7 +122,7 @@ extern void ShapeExtensionInit(void);
 #ifdef MITSHM
 #include <X11/extensions/shm.h>
 #include <X11/extensions/shmproto.h>
-extern Bool noMITShmExtension;
+extern _X_EXPORT Bool noMITShmExtension;
 extern void ShmExtensionInit(void);
 #endif
 
@@ -133,20 +133,20 @@ extern void XCMiscExtensionInit(void);
 #ifdef XCSECURITY
 #include <X11/extensions/secur.h>
 #include "securitysrv.h"
-extern Bool noSecurityExtension;
+extern _X_EXPORT Bool noSecurityExtension;
 extern void SecurityExtensionInit(void);
 #endif
 
 #ifdef XF86BIGFONT
 #include <X11/extensions/xf86bigfproto.h>
-extern Bool noXFree86BigfontExtension;
+extern _X_EXPORT Bool noXFree86BigfontExtension;
 extern void XFree86BigfontExtensionInit(void);
 #endif
 
 extern void BigReqExtensionInit(void);
 
 #ifdef XFIXES
-extern Bool noXFixesExtension;
+extern _X_EXPORT Bool noXFixesExtension;
 extern void XFixesExtensionInit(void);
 #endif
 
@@ -160,7 +160,7 @@ extern void XkbExtensionInit(void);
 
 #if defined(XSELINUX)
 #include "xselinux.h"
-extern Bool noSELinuxExtension;
+extern _X_EXPORT Bool noSELinuxExtension;
 extern void SELinuxExtensionInit(void);
 #endif
 
@@ -171,14 +171,14 @@ extern void XTestExtensionInit(void);
 #endif
 
 #ifdef INXQUARTZ
-extern Bool noPseudoramiXExtension;
+extern _X_EXPORT Bool noPseudoramiXExtension;
 extern void PseudoramiXExtensionInit(void);
 #endif
 
 #if defined(XV)
 #include <X11/extensions/Xv.h>
 #include <X11/extensions/XvMC.h>
-extern Bool noXvExtension;
+extern _X_EXPORT Bool noXvExtension;
 extern void XvExtensionInit(void);
 extern void XvMCExtensionInit(void);
 #endif
diff --git a/xorg-server/include/os.h b/xorg-server/include/os.h
index 2b5f26368..015800089 100644
--- a/xorg-server/include/os.h
+++ b/xorg-server/include/os.h
@@ -361,9 +361,13 @@ Fopen(const char *, const char *);
 extern _X_EXPORT int
 Fclose(pointer);
 #else
-#define System(a) system(a)
-#define Popen(a,b) popen(a,b)
-#define Pclose(a) pclose(a)
+
+extern const char *
+Win32TempDir(void);
+
+extern int
+System(const char *cmdline);
+
 #define Fopen(a,b) fopen(a,b)
 #define Fclose(a) fclose(a)
 #endif