Commit 43c18c13 authored by Francois Gouget's avatar Francois Gouget Committed by Alexandre Julliard

winapi_test: FIELD_ALIGNMENT() is redundant so remove it.

parent 2e668d25
...@@ -28,21 +28,13 @@ ...@@ -28,21 +28,13 @@
*/ */
#if defined(_MSC_VER) && (_MSC_VER >= 1300) && defined(__cplusplus) #if defined(_MSC_VER) && (_MSC_VER >= 1300) && defined(__cplusplus)
# define FIELD_ALIGNMENT(type, field) __alignof(((type*)0)->field)
#elif defined(__GNUC__)
# define FIELD_ALIGNMENT(type, field) __alignof__(((type*)0)->field)
#else
/* FIXME: Not sure if is possible to do without compiler extension */
#endif
#if defined(_MSC_VER) && (_MSC_VER >= 1300) && defined(__cplusplus)
# define _TYPE_ALIGNMENT(type) __alignof(type) # define _TYPE_ALIGNMENT(type) __alignof(type)
#elif defined(__GNUC__) #elif defined(__GNUC__)
# define _TYPE_ALIGNMENT(type) __alignof__(type) # define _TYPE_ALIGNMENT(type) __alignof__(type)
#else #else
/* /*
* FIXME: Not sure if is possible to do without compiler extension * FIXME: May not be possible without a compiler extension
* (if type is not just a name that is, if so the normal) * (if type is not just a name that is, otherwise the normal
* TYPE_ALIGNMENT can be used) * TYPE_ALIGNMENT can be used)
*/ */
#endif #endif
...@@ -61,9 +53,9 @@ ...@@ -61,9 +53,9 @@
#ifdef FIELD_ALIGNMENT #ifdef FIELD_ALIGNMENT
# define TEST_FIELD_ALIGNMENT(type, field, align) \ # define TEST_FIELD_ALIGNMENT(type, field, align) \
ok(FIELD_ALIGNMENT(type, field) == align, \ ok(_TYPE_ALIGNMENT(((type*)0)->field) == align, \
"FIELD_ALIGNMENT(" #type ", " #field ") == %d (expected " #align ")\n", \ "FIELD_ALIGNMENT(" #type ", " #field ") == %d (expected " #align ")\n", \
(int)FIELD_ALIGNMENT(type, field)) (int)_TYPE_ALIGNMENT(((type*)0)->field))
#else #else
# define TEST_FIELD_ALIGNMENT(type, field, align) do { } while (0) # define TEST_FIELD_ALIGNMENT(type, field, align) do { } while (0)
#endif #endif
......
...@@ -28,21 +28,13 @@ ...@@ -28,21 +28,13 @@
*/ */
#if defined(_MSC_VER) && (_MSC_VER >= 1300) && defined(__cplusplus) #if defined(_MSC_VER) && (_MSC_VER >= 1300) && defined(__cplusplus)
# define FIELD_ALIGNMENT(type, field) __alignof(((type*)0)->field)
#elif defined(__GNUC__)
# define FIELD_ALIGNMENT(type, field) __alignof__(((type*)0)->field)
#else
/* FIXME: Not sure if is possible to do without compiler extension */
#endif
#if defined(_MSC_VER) && (_MSC_VER >= 1300) && defined(__cplusplus)
# define _TYPE_ALIGNMENT(type) __alignof(type) # define _TYPE_ALIGNMENT(type) __alignof(type)
#elif defined(__GNUC__) #elif defined(__GNUC__)
# define _TYPE_ALIGNMENT(type) __alignof__(type) # define _TYPE_ALIGNMENT(type) __alignof__(type)
#else #else
/* /*
* FIXME: Not sure if is possible to do without compiler extension * FIXME: May not be possible without a compiler extension
* (if type is not just a name that is, if so the normal) * (if type is not just a name that is, otherwise the normal
* TYPE_ALIGNMENT can be used) * TYPE_ALIGNMENT can be used)
*/ */
#endif #endif
...@@ -61,9 +53,9 @@ ...@@ -61,9 +53,9 @@
#ifdef FIELD_ALIGNMENT #ifdef FIELD_ALIGNMENT
# define TEST_FIELD_ALIGNMENT(type, field, align) \ # define TEST_FIELD_ALIGNMENT(type, field, align) \
ok(FIELD_ALIGNMENT(type, field) == align, \ ok(_TYPE_ALIGNMENT(((type*)0)->field) == align, \
"FIELD_ALIGNMENT(" #type ", " #field ") == %d (expected " #align ")\n", \ "FIELD_ALIGNMENT(" #type ", " #field ") == %d (expected " #align ")\n", \
(int)FIELD_ALIGNMENT(type, field)) (int)_TYPE_ALIGNMENT(((type*)0)->field))
#else #else
# define TEST_FIELD_ALIGNMENT(type, field, align) do { } while (0) # define TEST_FIELD_ALIGNMENT(type, field, align) do { } while (0)
#endif #endif
......
...@@ -28,21 +28,13 @@ ...@@ -28,21 +28,13 @@
*/ */
#if defined(_MSC_VER) && (_MSC_VER >= 1300) && defined(__cplusplus) #if defined(_MSC_VER) && (_MSC_VER >= 1300) && defined(__cplusplus)
# define FIELD_ALIGNMENT(type, field) __alignof(((type*)0)->field)
#elif defined(__GNUC__)
# define FIELD_ALIGNMENT(type, field) __alignof__(((type*)0)->field)
#else
/* FIXME: Not sure if is possible to do without compiler extension */
#endif
#if defined(_MSC_VER) && (_MSC_VER >= 1300) && defined(__cplusplus)
# define _TYPE_ALIGNMENT(type) __alignof(type) # define _TYPE_ALIGNMENT(type) __alignof(type)
#elif defined(__GNUC__) #elif defined(__GNUC__)
# define _TYPE_ALIGNMENT(type) __alignof__(type) # define _TYPE_ALIGNMENT(type) __alignof__(type)
#else #else
/* /*
* FIXME: Not sure if is possible to do without compiler extension * FIXME: May not be possible without a compiler extension
* (if type is not just a name that is, if so the normal) * (if type is not just a name that is, otherwise the normal
* TYPE_ALIGNMENT can be used) * TYPE_ALIGNMENT can be used)
*/ */
#endif #endif
...@@ -61,9 +53,9 @@ ...@@ -61,9 +53,9 @@
#ifdef FIELD_ALIGNMENT #ifdef FIELD_ALIGNMENT
# define TEST_FIELD_ALIGNMENT(type, field, align) \ # define TEST_FIELD_ALIGNMENT(type, field, align) \
ok(FIELD_ALIGNMENT(type, field) == align, \ ok(_TYPE_ALIGNMENT(((type*)0)->field) == align, \
"FIELD_ALIGNMENT(" #type ", " #field ") == %d (expected " #align ")\n", \ "FIELD_ALIGNMENT(" #type ", " #field ") == %d (expected " #align ")\n", \
(int)FIELD_ALIGNMENT(type, field)) (int)_TYPE_ALIGNMENT(((type*)0)->field))
#else #else
# define TEST_FIELD_ALIGNMENT(type, field, align) do { } while (0) # define TEST_FIELD_ALIGNMENT(type, field, align) do { } while (0)
#endif #endif
......
...@@ -33,21 +33,13 @@ ...@@ -33,21 +33,13 @@
*/ */
#if defined(_MSC_VER) && (_MSC_VER >= 1300) && defined(__cplusplus) #if defined(_MSC_VER) && (_MSC_VER >= 1300) && defined(__cplusplus)
# define FIELD_ALIGNMENT(type, field) __alignof(((type*)0)->field)
#elif defined(__GNUC__)
# define FIELD_ALIGNMENT(type, field) __alignof__(((type*)0)->field)
#else
/* FIXME: Not sure if is possible to do without compiler extension */
#endif
#if defined(_MSC_VER) && (_MSC_VER >= 1300) && defined(__cplusplus)
# define _TYPE_ALIGNMENT(type) __alignof(type) # define _TYPE_ALIGNMENT(type) __alignof(type)
#elif defined(__GNUC__) #elif defined(__GNUC__)
# define _TYPE_ALIGNMENT(type) __alignof__(type) # define _TYPE_ALIGNMENT(type) __alignof__(type)
#else #else
/* /*
* FIXME: Not sure if is possible to do without compiler extension * FIXME: May not be possible without a compiler extension
* (if type is not just a name that is, if so the normal) * (if type is not just a name that is, otherwise the normal
* TYPE_ALIGNMENT can be used) * TYPE_ALIGNMENT can be used)
*/ */
#endif #endif
...@@ -66,9 +58,9 @@ ...@@ -66,9 +58,9 @@
#ifdef FIELD_ALIGNMENT #ifdef FIELD_ALIGNMENT
# define TEST_FIELD_ALIGNMENT(type, field, align) \ # define TEST_FIELD_ALIGNMENT(type, field, align) \
ok(FIELD_ALIGNMENT(type, field) == align, \ ok(_TYPE_ALIGNMENT(((type*)0)->field) == align, \
"FIELD_ALIGNMENT(" #type ", " #field ") == %d (expected " #align ")\n", \ "FIELD_ALIGNMENT(" #type ", " #field ") == %d (expected " #align ")\n", \
(int)FIELD_ALIGNMENT(type, field)) (int)_TYPE_ALIGNMENT(((type*)0)->field))
#else #else
# define TEST_FIELD_ALIGNMENT(type, field, align) do { } while (0) # define TEST_FIELD_ALIGNMENT(type, field, align) do { } while (0)
#endif #endif
......
...@@ -35,21 +35,13 @@ ...@@ -35,21 +35,13 @@
*/ */
#if defined(_MSC_VER) && (_MSC_VER >= 1300) && defined(__cplusplus) #if defined(_MSC_VER) && (_MSC_VER >= 1300) && defined(__cplusplus)
# define FIELD_ALIGNMENT(type, field) __alignof(((type*)0)->field)
#elif defined(__GNUC__)
# define FIELD_ALIGNMENT(type, field) __alignof__(((type*)0)->field)
#else
/* FIXME: Not sure if is possible to do without compiler extension */
#endif
#if defined(_MSC_VER) && (_MSC_VER >= 1300) && defined(__cplusplus)
# define _TYPE_ALIGNMENT(type) __alignof(type) # define _TYPE_ALIGNMENT(type) __alignof(type)
#elif defined(__GNUC__) #elif defined(__GNUC__)
# define _TYPE_ALIGNMENT(type) __alignof__(type) # define _TYPE_ALIGNMENT(type) __alignof__(type)
#else #else
/* /*
* FIXME: Not sure if is possible to do without compiler extension * FIXME: May not be possible without a compiler extension
* (if type is not just a name that is, if so the normal) * (if type is not just a name that is, otherwise the normal
* TYPE_ALIGNMENT can be used) * TYPE_ALIGNMENT can be used)
*/ */
#endif #endif
...@@ -68,9 +60,9 @@ ...@@ -68,9 +60,9 @@
#ifdef FIELD_ALIGNMENT #ifdef FIELD_ALIGNMENT
# define TEST_FIELD_ALIGNMENT(type, field, align) \ # define TEST_FIELD_ALIGNMENT(type, field, align) \
ok(FIELD_ALIGNMENT(type, field) == align, \ ok(_TYPE_ALIGNMENT(((type*)0)->field) == align, \
"FIELD_ALIGNMENT(" #type ", " #field ") == %d (expected " #align ")\n", \ "FIELD_ALIGNMENT(" #type ", " #field ") == %d (expected " #align ")\n", \
(int)FIELD_ALIGNMENT(type, field)) (int)_TYPE_ALIGNMENT(((type*)0)->field))
#else #else
# define TEST_FIELD_ALIGNMENT(type, field, align) do { } while (0) # define TEST_FIELD_ALIGNMENT(type, field, align) do { } while (0)
#endif #endif
......
...@@ -33,21 +33,13 @@ ...@@ -33,21 +33,13 @@
*/ */
#if defined(_MSC_VER) && (_MSC_VER >= 1300) && defined(__cplusplus) #if defined(_MSC_VER) && (_MSC_VER >= 1300) && defined(__cplusplus)
# define FIELD_ALIGNMENT(type, field) __alignof(((type*)0)->field)
#elif defined(__GNUC__)
# define FIELD_ALIGNMENT(type, field) __alignof__(((type*)0)->field)
#else
/* FIXME: Not sure if is possible to do without compiler extension */
#endif
#if defined(_MSC_VER) && (_MSC_VER >= 1300) && defined(__cplusplus)
# define _TYPE_ALIGNMENT(type) __alignof(type) # define _TYPE_ALIGNMENT(type) __alignof(type)
#elif defined(__GNUC__) #elif defined(__GNUC__)
# define _TYPE_ALIGNMENT(type) __alignof__(type) # define _TYPE_ALIGNMENT(type) __alignof__(type)
#else #else
/* /*
* FIXME: Not sure if is possible to do without compiler extension * FIXME: May not be possible without a compiler extension
* (if type is not just a name that is, if so the normal) * (if type is not just a name that is, otherwise the normal
* TYPE_ALIGNMENT can be used) * TYPE_ALIGNMENT can be used)
*/ */
#endif #endif
...@@ -66,9 +58,9 @@ ...@@ -66,9 +58,9 @@
#ifdef FIELD_ALIGNMENT #ifdef FIELD_ALIGNMENT
# define TEST_FIELD_ALIGNMENT(type, field, align) \ # define TEST_FIELD_ALIGNMENT(type, field, align) \
ok(FIELD_ALIGNMENT(type, field) == align, \ ok(_TYPE_ALIGNMENT(((type*)0)->field) == align, \
"FIELD_ALIGNMENT(" #type ", " #field ") == %d (expected " #align ")\n", \ "FIELD_ALIGNMENT(" #type ", " #field ") == %d (expected " #align ")\n", \
(int)FIELD_ALIGNMENT(type, field)) (int)_TYPE_ALIGNMENT(((type*)0)->field))
#else #else
# define TEST_FIELD_ALIGNMENT(type, field, align) do { } while (0) # define TEST_FIELD_ALIGNMENT(type, field, align) do { } while (0)
#endif #endif
......
...@@ -31,21 +31,13 @@ ...@@ -31,21 +31,13 @@
*/ */
#if defined(_MSC_VER) && (_MSC_VER >= 1300) && defined(__cplusplus) #if defined(_MSC_VER) && (_MSC_VER >= 1300) && defined(__cplusplus)
# define FIELD_ALIGNMENT(type, field) __alignof(((type*)0)->field)
#elif defined(__GNUC__)
# define FIELD_ALIGNMENT(type, field) __alignof__(((type*)0)->field)
#else
/* FIXME: Not sure if is possible to do without compiler extension */
#endif
#if defined(_MSC_VER) && (_MSC_VER >= 1300) && defined(__cplusplus)
# define _TYPE_ALIGNMENT(type) __alignof(type) # define _TYPE_ALIGNMENT(type) __alignof(type)
#elif defined(__GNUC__) #elif defined(__GNUC__)
# define _TYPE_ALIGNMENT(type) __alignof__(type) # define _TYPE_ALIGNMENT(type) __alignof__(type)
#else #else
/* /*
* FIXME: Not sure if is possible to do without compiler extension * FIXME: May not be possible without a compiler extension
* (if type is not just a name that is, if so the normal) * (if type is not just a name that is, otherwise the normal
* TYPE_ALIGNMENT can be used) * TYPE_ALIGNMENT can be used)
*/ */
#endif #endif
...@@ -64,9 +56,9 @@ ...@@ -64,9 +56,9 @@
#ifdef FIELD_ALIGNMENT #ifdef FIELD_ALIGNMENT
# define TEST_FIELD_ALIGNMENT(type, field, align) \ # define TEST_FIELD_ALIGNMENT(type, field, align) \
ok(FIELD_ALIGNMENT(type, field) == align, \ ok(_TYPE_ALIGNMENT(((type*)0)->field) == align, \
"FIELD_ALIGNMENT(" #type ", " #field ") == %d (expected " #align ")\n", \ "FIELD_ALIGNMENT(" #type ", " #field ") == %d (expected " #align ")\n", \
(int)FIELD_ALIGNMENT(type, field)) (int)_TYPE_ALIGNMENT(((type*)0)->field))
#else #else
# define TEST_FIELD_ALIGNMENT(type, field, align) do { } while (0) # define TEST_FIELD_ALIGNMENT(type, field, align) do { } while (0)
#endif #endif
......
...@@ -28,21 +28,13 @@ ...@@ -28,21 +28,13 @@
*/ */
#if defined(_MSC_VER) && (_MSC_VER >= 1300) && defined(__cplusplus) #if defined(_MSC_VER) && (_MSC_VER >= 1300) && defined(__cplusplus)
# define FIELD_ALIGNMENT(type, field) __alignof(((type*)0)->field)
#elif defined(__GNUC__)
# define FIELD_ALIGNMENT(type, field) __alignof__(((type*)0)->field)
#else
/* FIXME: Not sure if is possible to do without compiler extension */
#endif
#if defined(_MSC_VER) && (_MSC_VER >= 1300) && defined(__cplusplus)
# define _TYPE_ALIGNMENT(type) __alignof(type) # define _TYPE_ALIGNMENT(type) __alignof(type)
#elif defined(__GNUC__) #elif defined(__GNUC__)
# define _TYPE_ALIGNMENT(type) __alignof__(type) # define _TYPE_ALIGNMENT(type) __alignof__(type)
#else #else
/* /*
* FIXME: Not sure if is possible to do without compiler extension * FIXME: May not be possible without a compiler extension
* (if type is not just a name that is, if so the normal) * (if type is not just a name that is, otherwise the normal
* TYPE_ALIGNMENT can be used) * TYPE_ALIGNMENT can be used)
*/ */
#endif #endif
...@@ -61,9 +53,9 @@ ...@@ -61,9 +53,9 @@
#ifdef FIELD_ALIGNMENT #ifdef FIELD_ALIGNMENT
# define TEST_FIELD_ALIGNMENT(type, field, align) \ # define TEST_FIELD_ALIGNMENT(type, field, align) \
ok(FIELD_ALIGNMENT(type, field) == align, \ ok(_TYPE_ALIGNMENT(((type*)0)->field) == align, \
"FIELD_ALIGNMENT(" #type ", " #field ") == %d (expected " #align ")\n", \ "FIELD_ALIGNMENT(" #type ", " #field ") == %d (expected " #align ")\n", \
(int)FIELD_ALIGNMENT(type, field)) (int)_TYPE_ALIGNMENT(((type*)0)->field))
#else #else
# define TEST_FIELD_ALIGNMENT(type, field, align) do { } while (0) # define TEST_FIELD_ALIGNMENT(type, field, align) do { } while (0)
#endif #endif
......
...@@ -32,21 +32,13 @@ ...@@ -32,21 +32,13 @@
*/ */
#if defined(_MSC_VER) && (_MSC_VER >= 1300) && defined(__cplusplus) #if defined(_MSC_VER) && (_MSC_VER >= 1300) && defined(__cplusplus)
# define FIELD_ALIGNMENT(type, field) __alignof(((type*)0)->field)
#elif defined(__GNUC__)
# define FIELD_ALIGNMENT(type, field) __alignof__(((type*)0)->field)
#else
/* FIXME: Not sure if is possible to do without compiler extension */
#endif
#if defined(_MSC_VER) && (_MSC_VER >= 1300) && defined(__cplusplus)
# define _TYPE_ALIGNMENT(type) __alignof(type) # define _TYPE_ALIGNMENT(type) __alignof(type)
#elif defined(__GNUC__) #elif defined(__GNUC__)
# define _TYPE_ALIGNMENT(type) __alignof__(type) # define _TYPE_ALIGNMENT(type) __alignof__(type)
#else #else
/* /*
* FIXME: Not sure if is possible to do without compiler extension * FIXME: May not be possible without a compiler extension
* (if type is not just a name that is, if so the normal) * (if type is not just a name that is, otherwise the normal
* TYPE_ALIGNMENT can be used) * TYPE_ALIGNMENT can be used)
*/ */
#endif #endif
...@@ -65,9 +57,9 @@ ...@@ -65,9 +57,9 @@
#ifdef FIELD_ALIGNMENT #ifdef FIELD_ALIGNMENT
# define TEST_FIELD_ALIGNMENT(type, field, align) \ # define TEST_FIELD_ALIGNMENT(type, field, align) \
ok(FIELD_ALIGNMENT(type, field) == align, \ ok(_TYPE_ALIGNMENT(((type*)0)->field) == align, \
"FIELD_ALIGNMENT(" #type ", " #field ") == %d (expected " #align ")\n", \ "FIELD_ALIGNMENT(" #type ", " #field ") == %d (expected " #align ")\n", \
(int)FIELD_ALIGNMENT(type, field)) (int)_TYPE_ALIGNMENT(((type*)0)->field))
#else #else
# define TEST_FIELD_ALIGNMENT(type, field, align) do { } while (0) # define TEST_FIELD_ALIGNMENT(type, field, align) do { } while (0)
#endif #endif
......
...@@ -512,21 +512,13 @@ sub output_header($$$) { ...@@ -512,21 +512,13 @@ sub output_header($$$) {
print OUT " */\n"; print OUT " */\n";
print OUT "\n"; print OUT "\n";
print OUT "#if defined(_MSC_VER) && (_MSC_VER >= 1300) && defined(__cplusplus)\n"; print OUT "#if defined(_MSC_VER) && (_MSC_VER >= 1300) && defined(__cplusplus)\n";
print OUT "# define FIELD_ALIGNMENT(type, field) __alignof(((type*)0)->field)\n";
print OUT "#elif defined(__GNUC__)\n";
print OUT "# define FIELD_ALIGNMENT(type, field) __alignof__(((type*)0)->field)\n";
print OUT "#else\n";
print OUT "/* FIXME: Not sure if is possible to do without compiler extension */\n";
print OUT "#endif\n";
print OUT "\n";
print OUT "#if defined(_MSC_VER) && (_MSC_VER >= 1300) && defined(__cplusplus)\n";
print OUT "# define _TYPE_ALIGNMENT(type) __alignof(type)\n"; print OUT "# define _TYPE_ALIGNMENT(type) __alignof(type)\n";
print OUT "#elif defined(__GNUC__)\n"; print OUT "#elif defined(__GNUC__)\n";
print OUT "# define _TYPE_ALIGNMENT(type) __alignof__(type)\n"; print OUT "# define _TYPE_ALIGNMENT(type) __alignof__(type)\n";
print OUT "#else\n"; print OUT "#else\n";
print OUT "/*\n"; print OUT "/*\n";
print OUT " * FIXME: Not sure if is possible to do without compiler extension\n"; print OUT " * FIXME: May not be possible without a compiler extension\n";
print OUT " * (if type is not just a name that is, if so the normal)\n"; print OUT " * (if type is not just a name that is, otherwise the normal\n";
print OUT " * TYPE_ALIGNMENT can be used)\n"; print OUT " * TYPE_ALIGNMENT can be used)\n";
print OUT " */\n"; print OUT " */\n";
print OUT "#endif\n"; print OUT "#endif\n";
...@@ -546,9 +538,9 @@ sub output_header($$$) { ...@@ -546,9 +538,9 @@ sub output_header($$$) {
print OUT "\n"; print OUT "\n";
print OUT "#ifdef FIELD_ALIGNMENT\n"; print OUT "#ifdef FIELD_ALIGNMENT\n";
print OUT "# define TEST_FIELD_ALIGNMENT(type, field, align) \\\n"; print OUT "# define TEST_FIELD_ALIGNMENT(type, field, align) \\\n";
print OUT " ok(FIELD_ALIGNMENT(type, field) == align, \\\n"; print OUT " ok(_TYPE_ALIGNMENT(((type*)0)->field) == align, \\\n";
print OUT " \"FIELD_ALIGNMENT(\" #type \", \" #field \") == %d (expected \" #align \")\\n\", \\\n"; print OUT " \"FIELD_ALIGNMENT(\" #type \", \" #field \") == %d (expected \" #align \")\\n\", \\\n";
print OUT " (int)FIELD_ALIGNMENT(type, field))\n"; print OUT " (int)_TYPE_ALIGNMENT(((type*)0)->field))\n";
print OUT "#else\n"; print OUT "#else\n";
print OUT "# define TEST_FIELD_ALIGNMENT(type, field, align) do { } while (0)\n"; print OUT "# define TEST_FIELD_ALIGNMENT(type, field, align) do { } while (0)\n";
print OUT "#endif\n"; print OUT "#endif\n";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment