Fix the Windows build, there are a couple of things to note:

* I rebroke the stdout logger I'll fix that in unix.
 * There is a new header libaegisub/types.h which is a temp solution until I sort out something more realistic.  It's too early to tell what the proper solution will be.

Originally committed to SVN as r4394.
This commit is contained in:
Amar Takhar 2010-06-01 08:03:17 +00:00
parent 002f284bea
commit 7e83443c3e
4 changed files with 38 additions and 1 deletions

View file

@ -20,7 +20,7 @@
#include <stdio.h> #include <stdio.h>
#include <sys/time.h> #include <time.h>
#include <string.h> #include <string.h>
#include "libaegisub/log.h" #include "libaegisub/log.h"

View file

@ -33,6 +33,7 @@
#include <vector> #include <vector>
#endif #endif
//#include <libaegisub/exception.h> //#include <libaegisub/exception.h>
#include <libaegisub/types.h>
// These macros below aren't a perm solution, it will depend on how annoying they are through // These macros below aren't a perm solution, it will depend on how annoying they are through
// actual usage, and also depends on msvc support. // actual usage, and also depends on msvc support.

View file

@ -0,0 +1,35 @@
// Copyright (c) 2010, Amar Takhar <verm@aegisub.org>
//
// Permission to use, copy, modify, and distribute this software for any
// purpose with or without fee is hereby granted, provided that the above
// copyright notice and this permission notice appear in all copies.
//
// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
// ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
// ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
// OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
//
// $Id$
/// @file types.h
/// @brief Platform specific types.
/// @ingroup libaegisub
#ifndef LAGI_PRE
#endif // LAGI_PRE
#pragma once
namespace agi {
#if defined(_WIN32)
typedef struct timeval {
long tv_sec;
long tv_usec;
} timeval;
#endif
} // namespace agi

View file

@ -25,6 +25,7 @@
#endif // LAGI_PRE #endif // LAGI_PRE
#include <libaegisub/access.h> #include <libaegisub/access.h>
#include <libaegisub/types.h>
namespace agi { namespace agi {
namespace util { namespace util {