diff options
| author | Michael Roitzsch <mroi@users.sourceforge.net> | 2003-12-29 16:24:33 +0000 |
|---|---|---|
| committer | Michael Roitzsch <mroi@users.sourceforge.net> | 2003-12-29 16:24:33 +0000 |
| commit | 943d0dd49820480de0dc57a3e1aa50d750ab4c65 (patch) | |
| tree | bb1fd799c4ace483217080598af77a436f084087 | |
| parent | cd4b6e4f2b5e59c62b3ebe759fa88ad9d5b3aba5 (diff) | |
| download | xine-lib-943d0dd49820480de0dc57a3e1aa50d750ab4c65.tar.gz xine-lib-943d0dd49820480de0dc57a3e1aa50d750ab4c65.tar.bz2 | |
getting rid of some MSVC specific parts
CVS patchset: 5955
CVS date: 2003/12/29 16:24:33
| -rw-r--r-- | src/xine-engine/load_plugins.c | 15 | ||||
| -rw-r--r-- | src/xine-utils/xineutils.h | 11 |
2 files changed, 4 insertions, 22 deletions
diff --git a/src/xine-engine/load_plugins.c b/src/xine-engine/load_plugins.c index 212a9d3df..6edc243b3 100644 --- a/src/xine-engine/load_plugins.c +++ b/src/xine-engine/load_plugins.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: load_plugins.c,v 1.170 2003/12/14 23:23:17 f1rmb Exp $ + * $Id: load_plugins.c,v 1.171 2003/12/29 16:24:33 mroi Exp $ * * * Load input/demux/audio_out/video_out/codec plugins @@ -676,15 +676,8 @@ static void save_plugin_list(FILE *fp, xine_list_t *plugins) { while (node) { fprintf(fp, "[%s]\n", node->filename ); - -#ifndef _MSC_VER - fprintf(fp, "size=%llu\n", (unsigned long long) node->filesize ); - fprintf(fp, "mtime=%llu\n", (unsigned long long) node->filemtime ); -#else fprintf(fp, "size=%llu\n", (uint64_t) node->filesize ); fprintf(fp, "mtime=%llu\n", (uint64_t) node->filemtime ); -#endif /* _MSC_VER */ - fprintf(fp, "type=%d\n", node->info->type ); fprintf(fp, "api=%d\n", node->info->API ); fprintf(fp, "id=%s\n", node->info->id ); @@ -737,13 +730,7 @@ static void load_plugin_list(FILE *fp, xine_list_t *plugins) { ao_info_t *ao_info = NULL; post_info_t *post_info = NULL; int i; - -#ifndef _MSC_VER - unsigned long long llu; -#else uint64_t llu; -#endif /* _MSC_VER */ - unsigned long lu; char line[1024]; char *value; diff --git a/src/xine-utils/xineutils.h b/src/xine-utils/xineutils.h index d70542506..22bfb9e8f 100644 --- a/src/xine-utils/xineutils.h +++ b/src/xine-utils/xineutils.h @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: xineutils.h,v 1.77 2003/12/26 18:37:59 valtri Exp $ + * $Id: xineutils.h,v 1.78 2003/12/29 16:24:33 mroi Exp $ * */ #ifndef XINEUTILS_H @@ -108,13 +108,8 @@ uint32_t xine_mm_accel (void); #if defined(ARCH_X86) || defined(ARCH_X86_64) typedef union { -#ifdef _MSC_VER - int64_t q; /* Quadword (64-bit) value */ - uint64_t uq; /* Unsigned Quadword */ -#else - long long q; /* Quadword (64-bit) value */ - unsigned long long uq; /* Unsigned Quadword */ -#endif + int64_t q; /* Quadword (64-bit) value */ + uint64_t uq; /* Unsigned Quadword */ int d[2]; /* 2 Doubleword (32-bit) values */ unsigned int ud[2]; /* 2 Unsigned Doubleword */ short w[4]; /* 4 Word (16-bit) values */ |