[xiph-cvs] cvs commit: ogg/include/ogg config_types.h.in os_types.h Makefile.am os_types.h.in

[Jack Moffitt]

jack        00/10/06 00:32:31

  Modified:    include/ogg Makefile.am
  Added:       include/ogg config_types.h.in os_types.h
  Removed:     include/ogg os_types.h.in
  Log:
  macintosh build fixes for ogg
  os_types.h should be win32 and mac ready

Revision  Changes    Path
1.2       +1 -1      ogg/include/ogg/Makefile.am

Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/ogg/include/ogg/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.am	2000/09/03 05:54:27	1.1
+++ Makefile.am	2000/10/06 07:32:30	1.2
@@ -4,4 +4,4 @@
 
 includedir = $(prefix)/include/ogg
 
-include_HEADERS = ogg.h os_types.h
+include_HEADERS = ogg.h os_types.h config_types.h

1.1                  ogg/include/ogg/config_types.h.in

Index: config_types.h.in
===================================================================
#ifndef __CONFIG_TYPES_H__
#define __CONFIG_TYPES_H__

/* these are filled in by configure */
typedef @SIZE16@ ogg_int16_t;
typedef @SIZE32@ ogg_int32_t;
typedef @USIZE32@ ogg_uint32_t;
typedef @SIZE64@ ogg_int64_t;

#endif

1.1                  ogg/include/ogg/os_types.h

Index: os_types.h
===================================================================
/********************************************************************
 *                                                                  *
 * THIS FILE IS PART OF THE Ogg Vorbis SOFTWARE CODEC SOURCE CODE.  *
 * USE, DISTRIBUTION AND REPRODUCTION OF THIS SOURCE IS GOVERNED BY *
 * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE.    *
 * PLEASE READ THESE TERMS DISTRIBUTING.                            *
 *                                                                  *
 * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-2000             *
 * by Monty <monty at xiph.org> and The XIPHOPHORUS Company            *
 * http://www.xiph.org/                                             *
 *                                                                  *
 ********************************************************************

 function: #ifdef jail to whip a few platforms into the UNIX ideal.
 last mod: $Id: os_types.h,v 1.1 2000/10/06 07:32:30 jack Exp $

 ********************************************************************/
#ifndef _OS_TYPES_H
#define _OS_TYPES_H

#ifdef _WIN32 
#  ifndef __GNUC__

/* MSVC/Borland */
typedef __int64 ogg_int64_t;
typedef __int32 ogg_int32_t;
typedef unsigned __int32 ogg_uint32_t;
typedef __int16 ogg_int16_t;

#  else

/* Cygwin */
#include <_G_config.h>
typedef _G_int64_t ogg_int64_t;
typedef _G_int32_t ogg_int32_t;
typedef unsigned _G_int32_t ogg_uint32_t;
typedef _G_int16_t ogg_int16_t;

#  endif
#else

#  ifdef macintosh

#include <sys/types.h>

typedef SInt16 ogg_int16_t;
typedef SInt32 ogg_int32_t;
typedef UInt32 ogg_uint32_t;
typedef SInt64 ogg_int64_t;

#  else

#    ifdef __BEOS__

/* Be */
#include <inttypes.h>

#    endif

#include <sys/types.h>
#include <ogg/config_types.h>

#  endif /* macintosh */

#endif  /* _WIN32 */

#endif  /* _OS_TYPES_H */

--- >8 ----
List archives:  http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body.  No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.