diff options
| author | marha <marha@users.sourceforge.net> | 2010-06-11 14:16:16 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-06-11 14:16:16 +0000 |
| commit | d1e4f4b8546c7955c66dd023bfd6ef437db9d21d (patch) | |
| tree | 529985e77bfc95aa95fe5b540e8f42b0ef041206 /xorg-server/include/misc.h | |
| parent | 13919cf85a6ca41d97238de13344aba59e0f7680 (diff) | |
| parent | 4c61bf84b11e26e6f22648668c95ea760a379163 (diff) | |
| download | vcxsrv-d1e4f4b8546c7955c66dd023bfd6ef437db9d21d.tar.gz vcxsrv-d1e4f4b8546c7955c66dd023bfd6ef437db9d21d.tar.bz2 vcxsrv-d1e4f4b8546c7955c66dd023bfd6ef437db9d21d.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/include/misc.h')
| -rw-r--r-- | xorg-server/include/misc.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/xorg-server/include/misc.h b/xorg-server/include/misc.h index 847864ce9..7a9566d26 100644 --- a/xorg-server/include/misc.h +++ b/xorg-server/include/misc.h @@ -80,6 +80,10 @@ OF THIS SOFTWARE. #include <stddef.h>
+#ifdef _MSC_VER
+#define inline __inline
+#endif
+
#ifndef MAXSCREENS
#define MAXSCREENS 16
#endif
|