[GNUnet-SVN] r1635 - in Extractor: . src/include

[grothoff]

Author: grothoff
Date: 2005-08-08 23:36:41 -0700 (Mon, 08 Aug 2005)
New Revision: 1635

Modified:
   Extractor/ChangeLog
   Extractor/src/include/plibc.h
Log:
fix

Modified: Extractor/ChangeLog
===================================================================
--- Extractor/ChangeLog 2005-08-09 06:23:32 UTC (rev 1634)
+++ Extractor/ChangeLog 2005-08-09 06:36:41 UTC (rev 1635)
@@ -1,5 +1,6 @@
 Mon Aug  8 12:18:44 PDT 2005
        Somehow addKeyword2 got lost.  Added (again?).
+       Fixed compilation problems with gcc-2.95.
 
 Thu Jul 14 18:52:17 CEST 2005
        Bugfixes in exiv2 extractor fixing remaining issues.

Modified: Extractor/src/include/plibc.h
===================================================================
--- Extractor/src/include/plibc.h       2005-08-09 06:23:32 UTC (rev 1634)
+++ Extractor/src/include/plibc.h       2005-08-09 06:36:41 UTC (rev 1635)
@@ -439,20 +439,20 @@
  #define RANDOM() random()
  #define READLINK(p, b, s) readlink(p, b, s)
  #define LSTAT(p, b) lstat(p, b)
- #define PRINTF(f, ...) printf(f , __VA_ARGS__)
- #define FPRINTF(fil, fmt, ...) fprintf(fil, fmt, __VA_ARGS__)
+ #define PRINTF printf
+ #define FPRINTF fprintf
  #define VPRINTF(f, a) vprintf(f, a)
  #define VFPRINTF(s, f, a) vfprintf(s, f, a)
  #define VSPRINTF(d, f, a) vsprintf(d, f, a)
  #define VSNPRINTF(str, size, fmt, a) vsnprintf(str, size, fmt, a)
- #define _REAL_SNPRINTF(str, size, fmt, ...) snprintf(str, size, fmt, 
__VA_ARGS__)
- #define SPRINTF(d, f, ...) sprintf(d, f, __VA_ARGS__)
+ #define _REAL_SNPRINTF snprintf
+ #define SPRINTF sprintf
  #define VSSCANF(s, f, a) vsscanf(s, f, a)
- #define SSCANF(s, f, ...) sscanf(s, f, __VA_ARGS__)
+ #define SSCANF sscanf
  #define VFSCANF(s, f, a) vfscanf(s, f, a)
  #define VSCANF(f, a) vscanf(f, a)
- #define SCANF(f, ...) scanf(f, __VA_ARGS__)
- #define FSCANF(s, f, ...) fscanf(s, f, __VA_ARGS__)
+ #define SCANF scanf
+ #define FSCANF fscanf
  #define WAITPID(p, s, o) waitpid(p, s, o)
  #define ACCEPT(s, a, l) accept(s, a, l)
  #define BIND(s, n, l) bind(s, n, l)