* include/wchar.h (_wctime32): Create _CRTALIAS when MSVCRT_VERSION
< 800.
(_wfindfirst32, _wfindnext32): Create _CRTALIAS.
+ * include/objdump.h: Move include of rpc.h and rpcndr.h due to
+ dependencies.
+ * include/rpc.h: Move include of windows.h due to dependencies.
2013-05-28 Earnie Boyd <earnie@users.sourceforge.net>
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
- *
+ *
* The above copyright notice and this permission notice (including the next
* paragraph) shall be included in all copies or substantial portions of the
* Software.
- *
+ *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
* DEALINGS IN THE SOFTWARE.
*/
+/* Include here to prevent circular dependencies if windows.h not already
+ * included. ** DO NOT MOVE TO GUARD ** */
+#include <rpc.h>
+#include <rpcndr.h>
+
#ifndef _OBJBASE_H
#define _OBJBASE_H
#pragma GCC system_header
#include <_mingw.h>
-/* Include here to prevent circular dependencies if windows.h
- not already included */
-#include <rpc.h>
-#include <rpcndr.h>
-
#include <stdlib.h>
#pragma pack(push,8)
#include <basetyps.h>
#define COM_RIGHTS_SAFE_FOR_SCRIPTING 2
#define STGOPTIONS_VERSION 2
typedef enum tagSTGFMT {
- STGFMT_STORAGE = 0,
- STGFMT_FILE = 3,
- STGFMT_ANY = 4,
+ STGFMT_STORAGE = 0,
+ STGFMT_FILE = 3,
+ STGFMT_ANY = 4,
STGFMT_DOCFILE = 5
} STGFMT;
typedef struct tagSTGOPTIONS {
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
- *
+ *
* The above copyright notice and this permission notice (including the next
* paragraph) shall be included in all copies or substantial portions of the
* Software.
- *
+ *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
* DEALINGS IN THE SOFTWARE.
*/
+/* Include here to prevent circular dependencies if windows.h not already
+ * included. ** DO NOT MOVE TO GUARD ** */
+#ifndef RPC_NO_WINDOWS_H
+#include <windows.h>
+#endif
+
#ifndef _RPC_H
#define _RPC_H
#pragma GCC system_header
#include <_mingw.h>
-#ifndef RPC_NO_WINDOWS_H
-#include <windows.h>
-#endif
-
#ifdef __cplusplus
extern "C" {
#endif