Changeset 2957
- Timestamp:
- 2007-06-16 04:59:04 (2 years ago)
- Files:
-
- liboggz/trunk/configure.ac (modified) (2 diffs)
- liboggz/trunk/include/oggz/Makefile.am (modified) (2 diffs)
- liboggz/trunk/include/oggz/oggz.h (modified) (1 diff)
- liboggz/trunk/include/oggz/oggz_off_t.h (modified) (2 diffs)
- liboggz/trunk/include/oggz/oggz_off_t_generated.h.in (moved) (moved from liboggz/trunk/include/oggz/oggz_off_t.h.in) (2 diffs)
- liboggz/trunk/include/oggz/oggz_off_t_win32.h (deleted)
- liboggz/trunk/src/liboggz/oggz_private.h (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
liboggz/trunk/configure.ac
r2955 r2957 243 243 if test $SIZEOF_OGGZ_OFF_T = 4 ; then 244 244 OGGZ_OFF_MAX="0x7FFFFFFF" 245 fi 246 247 AC_DEFINE_UNQUOTED([TYPEOF_OGGZ_OFF_T],${TYPEOF_OGGZ_OFF_T}, [Set to long if unknown.]) 245 PRI_OGGZ_OFF_T="l" 246 elif test $SIZEOF_OGGZ_OFF_T = 8 ; then 247 PRI_OGGZ_OFF_T="q" 248 fi 249 250 dnl The following configured variables are written into the public header 251 dnl <oggz/oggz_off_t_generated.h>: 252 dnl oggz_off_t (typedef) 253 dnl PRI_OGGZ_OFF_T (printf format) 254 255 dnl AC_DEFINE_UNQUOTED([TYPEOF_OGGZ_OFF_T],${TYPEOF_OGGZ_OFF_T}, [Set to long if unknown.]) 248 256 AC_SUBST(TYPEOF_OGGZ_OFF_T) 257 258 AC_SUBST(PRI_OGGZ_OFF_T) 249 259 250 260 AC_DEFINE_UNQUOTED([SIZEOF_OGGZ_OFF_T],${SIZEOF_OGGZ_OFF_T}, [Set to sizeof (long) if unknown.]) … … 363 373 include/Makefile 364 374 include/oggz/Makefile 365 include/oggz/oggz_off_t .h375 include/oggz/oggz_off_t_generated.h 366 376 src/Makefile 367 377 src/liboggz/Version_script liboggz/trunk/include/oggz/Makefile.am
r2608 r2957 1 1 ## Process this file with automake to produce Makefile.in 2 3 EXTRA_DIST = oggz_off_t_generated.h.in 2 4 3 5 # Include files to install … … 5 7 oggzinclude_HEADERS = oggz.h oggz_comments.h oggz_constants.h oggz_read.h \ 6 8 oggz_seek.h oggz_write.h oggz_io.h oggz_table.h oggz_deprecated.h \ 7 oggz_off_t.h 9 oggz_off_t.h oggz_off_t_generated.h 8 10 11 BUILT_SOURCES = oggz_off_t_generated.h liboggz/trunk/include/oggz/oggz.h
r2885 r2957 564 564 long oggz_serialno_new (OGGZ * oggz); 565 565 566 /* define appropriate type for oggz_off_t */567 #ifdef _WIN32568 #include <oggz/oggz_off_t_win32.h>569 #else570 566 #include <oggz/oggz_off_t.h> 571 #endif572 573 #include <oggz/oggz_comments.h>574 567 #include <oggz/oggz_read.h> 575 568 #include <oggz/oggz_seek.h> 576 569 #include <oggz/oggz_write.h> 577 570 #include <oggz/oggz_io.h> 571 #include <oggz/oggz_comments.h> 578 572 #include <oggz/oggz_deprecated.h> 579 573 liboggz/trunk/include/oggz/oggz_off_t.h
r2956 r2957 35 35 36 36 /** \file 37 * Support for Large File Sizes on systems supporting 64-bit off_t types. 38 * 39 * This file is included by all files using loff_t for file 40 * position e.g.: \link config.h <config.h> \endlink, 41 * except on non-GNU Win32 systems \link ogg_off_t_w32.h \endlink is included 42 * instead. 43 * 44 * This file should never be included directly by user code. 45 */ 46 47 /** 48 * This typedef was determined on the system on which the documentation 49 * was generated. 50 * 51 * To query this on your system, do eg. 52 * 53 <pre> 54 echo "#include <config.h>" | gcc -E - | grep oggz_off_t 55 </pre> 56 * 37 * Architecture-dependent type and printf format for file position. 38 * Allows Large File Sizes on systems supporting 64-bit off_t types. 57 39 */ 58 40 … … 60 42 /* MSVC/Borland & Cygwin */ 61 43 typedef off_t oggz_off_t; 44 45 #define PRI_OGGZ_OFF_T "l" 46 62 47 #else 63 64 /* Linux/BSD/etc. */ 65 # include <sys/types.h> 66 typedef loff_t oggz_off_t; 67 68 #endif 69 70 /* Note: This is an ugly fix for proper display in printf but will work for now */ 71 #if SIZEOF_OGGZ_OFF_T == 8 72 #define PRI_OGGZ_OFF_T "q" 73 #else 74 #define PRI_OGGZ_OFF_T "l" 48 #include <oggz/oggz_off_t_generated.h> 75 49 #endif 76 50 liboggz/trunk/include/oggz/oggz_off_t_generated.h.in
r2956 r2957 31 31 */ 32 32 33 #ifndef __OGGZ_OFF_T_ H__34 #define __OGGZ_OFF_T_ H__33 #ifndef __OGGZ_OFF_T_GENERATED_H__ 34 #define __OGGZ_OFF_T_GENERATED_H__ 35 35 36 36 /** \file 37 * Support for Large File Sizes on systems supporting 64-bit off_t types.37 * Architecture-dependent type for oggz_off_t. 38 38 * 39 * This file is included by all files using @TYPEOF_OGGZ_OFF_T@ for file 40 * position e.g.: \link config.h <config.h> \endlink, 41 * except on non-GNU Win32 systems \link ogg_off_t_w32.h \endlink is included 42 * instead. 39 * This file should never be included directly by user code. Please include 40 * either of <oggz/oggz.h> or <oggz/oggz_off_t.h> instead. 43 41 * 44 * This file should never be included directly by user code. 42 * This file was generated when liboggz was built. 43 * 44 * Note that this file is only generated when using GNU autoconf. 45 * This file is not used on Win32 systems. 45 46 */ 46 47 … … 52 53 * 53 54 <pre> 54 echo " #include <config.h>" | gcc -E -| grep oggz_off_t55 echo "gcc -E oggz.h | grep oggz_off_t 55 56 </pre> 56 57 * 57 58 */ 58 59 59 #ifdef _WIN32 60 /* MSVC/Borland & Cygwin */ 61 typedef off_t oggz_off_t; 62 #else 63 64 /* Linux/BSD/etc. */ 65 # include <sys/types.h> 66 typedef @TYPEOF_OGGZ_OFF_T@ oggz_off_t; 60 #include <sys/types.h> 67 61 68 #endif 62 typedef @TYPEOF_OGGZ_OFF_T@ oggz_off_t; 69 63 70 /* Note: This is an ugly fix for proper display in printf but will work for now */ 71 #if SIZEOF_OGGZ_OFF_T == 8 72 #define PRI_OGGZ_OFF_T "q" 73 #else 74 #define PRI_OGGZ_OFF_T "l" 75 #endif 64 #define PRI_OGGZ_OFF_T "@PRI_OGGZ_OFF_T@" 76 65 77 #endif /* __OGGZ_OFF_T_ _ */66 #endif /* __OGGZ_OFF_T_GENERATED__ */ liboggz/trunk/src/liboggz/oggz_private.h
r2955 r2957 39 39 #include <ogg/ogg.h> 40 40 #include <oggz/oggz_constants.h> 41 42 /* define appropriate type for oggz_off_t */43 #ifdef _WIN3244 #include <oggz/oggz_off_t_win32.h>45 #else46 41 #include <oggz/oggz_off_t.h> 47 #endif48 42 49 43 #include "oggz_macros.h"
