merge XFree86 RC2 (4.3.99.902) from vendor branchXORG-RELEASE-1-BASEXEVIE-MERGEXEVIE-BASE

1 files changed, 4 insertions, 2 deletions

diff --git a/read.c b/read.c
index 07d2f2a..6628326 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.6 2003/12/19 02:16:36 dawes Exp $ */
+/* $XFree86: xc/programs/fonttosfnt/read.c,v 1.6 2003/12/19 02:16:36 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)