[GNUnet-SVN] r20972 - in Extractor/src: main plugins

[gnunet]

Author: grothoff
Date: 2012-04-12 23:04:16 +0200 (Thu, 12 Apr 2012)
New Revision: 20972

Modified:
   Extractor/src/main/extract.c
   Extractor/src/plugins/ebml_extractor.c
Log:
-LRN: make compile on Debian

Modified: Extractor/src/main/extract.c
===================================================================
--- Extractor/src/main/extract.c        2012-04-12 16:44:30 UTC (rev 20971)
+++ Extractor/src/main/extract.c        2012-04-12 21:04:16 UTC (rev 20972)
@@ -768,7 +768,11 @@
                         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 @@
           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];

Modified: Extractor/src/plugins/ebml_extractor.c
===================================================================
--- Extractor/src/plugins/ebml_extractor.c      2012-04-12 16:44:30 UTC (rev 
20971)
+++ Extractor/src/plugins/ebml_extractor.c      2012-04-12 21:04:16 UTC (rev 
20972)
@@ -1088,7 +1088,7 @@
 #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);