libextractor

commit 254738490be6c4784d1a97e407314e42930ee3e9
parent ec05c1c8a5304f221b6fcea24c67c478893e6c4a
Author: Christian Grothoff <christian@grothoff.org>
Date:   Thu, 12 Apr 2012 21:04:16 +0000

-LRN: make compile on Debian

Diffstat:
M
src/main/extract.c
 | 
12
++++++++++--
M
src/plugins/ebml_extractor.c
 | 
2
+-

2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/main/extract.c b/src/main/extract.c
@@ -768,7 +768,11 @@ main (int argc, char *argv[])
 		         NULL);
     else
     {
-      int f = open (argv[i], _O_RDONLY | _O_BINARY);
+      int f = open (argv[i], O_RDONLY
+#if WINDOWS
+                                       | O_BINARY
+#endif
+                    );
       if (f != -1)
       {
         int64_t k = 0;
@@ -785,7 +789,11 @@ main (int argc, char *argv[])
           int rd;
           unsigned char *data = malloc (k);
           close (f);
-          f = open (argv[i], _O_RDONLY | _O_BINARY);
+          f = open (argv[i], O_RDONLY
+#if WINDOWS
+                                       | O_BINARY
+#endif
+                   );
           for (j = 0; j < k; j += rd)
           {
             void *ptr = (void *) &data[j];
diff --git a/src/plugins/ebml_extractor.c b/src/plugins/ebml_extractor.c
@@ -1088,7 +1088,7 @@ report_state (struct ebml_state *state, EXTRACTOR_MetaDataProcessor proc, void *
 #if WINDOWS
       millenium_start_stamp = _mktime64 (&millenium_start);
 #else
-      millenium_start_stamp = (__time64_t) mktime (&millenium_start);
+      millenium_start_stamp = (time_t) mktime (&millenium_start);
 #endif
       if (millenium_start_stamp == -1)
         printf ("Failed to convert time: %d\n", errno);