diff options
Diffstat (limited to 'win32/plugins/dfxvideo')
| -rw-r--r-- | win32/plugins/dfxvideo/winsrc/d3d.h | 2 | ||||
| -rw-r--r-- | win32/plugins/dfxvideo/winsrc/d3dcaps.h | 2 | ||||
| -rw-r--r-- | win32/plugins/dfxvideo/winsrc/d3dtypes.h | 2 | ||||
| -rw-r--r-- | win32/plugins/dfxvideo/winsrc/ddraw.h | 32 |
4 files changed, 19 insertions, 19 deletions
diff --git a/win32/plugins/dfxvideo/winsrc/d3d.h b/win32/plugins/dfxvideo/winsrc/d3d.h index 7297755d..31d61cbb 100644 --- a/win32/plugins/dfxvideo/winsrc/d3d.h +++ b/win32/plugins/dfxvideo/winsrc/d3d.h @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef __WINE_D3D_H diff --git a/win32/plugins/dfxvideo/winsrc/d3dcaps.h b/win32/plugins/dfxvideo/winsrc/d3dcaps.h index b44c49d1..d631a675 100644 --- a/win32/plugins/dfxvideo/winsrc/d3dcaps.h +++ b/win32/plugins/dfxvideo/winsrc/d3dcaps.h @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef __WINE_D3DCAPS_H diff --git a/win32/plugins/dfxvideo/winsrc/d3dtypes.h b/win32/plugins/dfxvideo/winsrc/d3dtypes.h index 21b9e74d..223a0755 100644 --- a/win32/plugins/dfxvideo/winsrc/d3dtypes.h +++ b/win32/plugins/dfxvideo/winsrc/d3dtypes.h @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ /* FIXME: Need to add C++ code for certain structs for headers - this is going to be a problem diff --git a/win32/plugins/dfxvideo/winsrc/ddraw.h b/win32/plugins/dfxvideo/winsrc/ddraw.h index 7cd1df41..1288e8bd 100644 --- a/win32/plugins/dfxvideo/winsrc/ddraw.h +++ b/win32/plugins/dfxvideo/winsrc/ddraw.h @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef __WINE_DDRAW_H @@ -30,21 +30,21 @@ extern "C" { #define DIRECTDRAW_VERSION 0x0700 #endif /* DIRECTDRAW_VERSION */ -#ifndef WINELIB_NAME_AW
-#ifdef UNICODE
-#define WINELIB_NAME_AW(func) func##W
-#else
-#define WINELIB_NAME_AW(func) func##A
-#endif
-#endif
-
-#ifndef DECL_WINELIB_TYPE_AW
-#define DECL_WINELIB_TYPE_AW(type) typedef WINELIB_NAME_AW(type) type;
-#endif
-
-#ifndef DWORD_PTR
-#define DWORD_PTR unsigned long
-#endif
+#ifndef WINELIB_NAME_AW +#ifdef UNICODE +#define WINELIB_NAME_AW(func) func##W +#else +#define WINELIB_NAME_AW(func) func##A +#endif +#endif + +#ifndef DECL_WINELIB_TYPE_AW +#define DECL_WINELIB_TYPE_AW(type) typedef WINELIB_NAME_AW(type) type; +#endif + +#ifndef DWORD_PTR +#define DWORD_PTR unsigned long +#endif /***************************************************************************** * Predeclare the interfaces |
