ref: 1f18fc36923878841111e7f5752cf2e927b07233
parent: 8add71c3c44fc1019077e7bc8a94f44f7933c8dc
author: asau <asau@ficl.sf.net>
date: Wed Dec 22 04:24:03 CST 2010
Merge FreeBSD/alpha into generic unix case.
--- a/ficl.h
+++ b/ficl.h
@@ -4,7 +4,7 @@
** Author: John Sadler (john_sadler@alum.mit.edu)
** Created: 19 July 1997
** Dedicated to RHS, in loving memory
-** $Id: ficl.h,v 1.30 2010/12/22 09:33:46 asau Exp $
+** $Id: ficl.h,v 1.31 2010/12/22 10:24:03 asau Exp $
********************************************************************
**
** Copyright (c) 1997-2001 John Sadler (john_sadler@alum.mit.edu)
@@ -163,8 +163,6 @@
#include "ficlplatform/ansi.h"
#elif defined(_WIN32)
#include "ficlplatform/win32.h"
-#elif defined (FREEBSD_ALPHA)
- #include "ficlplatform/alpha.h"
#elif defined(unix) || defined(__unix__) || defined(__unix)
#include "ficlplatform/unix.h"
#else /* catch-all */
--- a/ficlplatform/alpha.h
+++ /dev/null
@@ -1,27 +1,0 @@
-/*
-** FreeBSD Alpha (64 bit) data types
-*/
-
-#define FICL_WANT_PLATFORM (1)
-
-#define FICL_PLATFORM_BASIC_TYPES (1)
-#define FICL_PLATFORM_ALIGNMENT (8)
-
-#define FICL_PLATFORM_HAS_2INTEGER (0)
-#define FICL_PLATFORM_HAS_FTRUNCATE (1)
-#define FICL_PLATFORM_INLINE inline
-#define FICL_PLATFORM_OS "FreeBSD"
-#define FICL_PLATFORM_ARCHITECTURE "alpha"
-
-typedef char ficlInteger8;
-typedef unsigned char ficlUnsigned8;
-typedef short ficlInteger16;
-typedef unsigned short ficlUnsigned16;
-typedef int ficlInteger32;
-typedef unsigned int ficlUnsigned32;
-typedef long ficlInteger64;
-typedef unsigned long ficlUnsigned64;
-
-typedef ficlInteger64 ficlInteger;
-typedef ficlUnsigned64 ficlUnsigned;
-typedef float ficlFloat;
--- a/ficlplatform/unix.h
+++ b/ficlplatform/unix.h
@@ -8,7 +8,7 @@
#define FICL_PLATFORM_ARCHITECTURE "unknown"
#define FICL_PLATFORM_BASIC_TYPES (1)
-#if defined(__amd64__)
+#if defined(__amd64__) || defined(__alpha__)
#define FICL_PLATFORM_ALIGNMENT (8)
#else
#define FICL_PLATFORM_ALIGNMENT (4)
@@ -16,7 +16,7 @@
#define FICL_PLATFORM_INLINE inline
#define FICL_PLATFORM_HAS_FTRUNCATE (1)
-#if defined(__amd64__)
+#if defined(__amd64__) || defined(__alpha__)
#define FICL_PLATFORM_HAS_2INTEGER (0)
#else
#define FICL_PLATFORM_HAS_2INTEGER (1)
@@ -31,7 +31,7 @@
typedef int64_t ficlInteger64;
typedef uint64_t ficlUnsigned64;
-#if defined(__amd64__)
+#if defined(__amd64__) || defined(__alpha__)
typedef ficlInteger64 ficlInteger;
typedef ficlUnsigned64 ficlUnsigned;
#else /* default */