summaryrefslogtreecommitdiff
path: root/read.c
diff options
context:
space:
mode:
authorAlexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>2004-03-17 20:32:13 +0000
committerAlexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>2004-03-17 20:32:13 +0000
commitcbe23f3df4fc7ebce5d77e2cf6a35a09242aba1b (patch)
tree8dc6a0307b625dc04df471c0dbd8d485c4b90424 /read.c
parenta46389d96c54351cd95614f1e5eae495f51957f0 (diff)
merge with XORG-RELEASE-1 (tag XORG-CYGWIN-LAST-MERGE)CYGWIN-RELEASE-1-MERGE
Diffstat (limited to 'read.c')
-rw-r--r--read.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/read.c b/read.c
index 07d2f2a..dd5bcef 100644
--- a/read.c
+++ b/read.c
@@ -19,13 +19,15 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/
-/* $XFree86: xc/programs/fonttosfnt/read.c,v 1.4 2003/11/21 05:22:09 dawes Exp $ */
+/* $XdotOrg: xc/programs/fonttosfnt/read.c,v 1.1.4.1.4.2 2004/03/04 19:45:27 kaleb Exp $ */
+/* $XFree86: xc/programs/fonttosfnt/read.c,v 1.5 2003/12/19 02:05:39 dawes Exp $ */
#include <stdio.h>
#include <ft2build.h>
#include FT_FREETYPE_H
#include FT_BDF_H
+#include "X11/Xos.h"
#include "fonttosfnt.h"
#include "fontenc.h"
@@ -38,7 +40,7 @@ static int ft_inited = 0;
static FT_Library ft_library;
static int
-FT_Ensure_Inited()
+FT_Ensure_Inited(void)
{
int rc;
if(ft_inited)