Changeset fa0fc6 in git

Timestamp:

Aug 29, 2012, 12:26:24 PM (10 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'ad2543eab51733612ba7d118afc77edca719600e')

Children:

fd201f7db7b17b257e7b311d82e82a23c2ee25ac

Parents:

39401391ee86c906c92f41d5e14ecc503d181b92

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-08-29 12:26:24+02:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-09-07 19:51:24+02:00

Message:

eliminate extern feFopen in faivour of include findexec and fix feFopen.h itself

Files:

• factory/singext.h (modified) (1 diff)
• factory/test.cc (modified) (2 diffs)
• findexec/feFopen.cc (modified) (1 diff)
• findexec/feFopen.h (modified) (2 diffs)

factory/singext.h

@@ -9 +9 @@
 #include <factory/cf_gmp.h>
 
-extern FILE * feFopen ( const char * path, const char * mode);
+#include <findexec/feFopen.h>
 
 /*BEGINPUBLIC*/

factory/test.cc

@@ -1 +1 @@
 #include <factory/factory.h>
+#include <findexec/feFopen.h>
 
 int mmInit(void) {
@@ -14 +15 @@
 Expected in: flat namespace
 */
-extern FILE * feFopen ( const char * path, const char * mode);
 const int f = (int)(long)(void*)feFopen;
 return (f ^ f) + 1; 

findexec/feFopen.cc

@@ -151 +151 @@
 }
 
-FILE * feFopen(const char *path, const char *mode)
-{
-  return feFopen (path, mode, 0,0,0);
-}
-
 // Make sure that mode contains binary option
 FILE* myfopen(const char *path, const char *mode)

findexec/feFopen.h

@@ -9 +9 @@
 #ifdef __cplusplus
 
-FILE*feFopen(const char *path, const char *mode, char *where, short useWerror=0, short path_only=0);
-FILE*feFopen(const char *path, const char *mode);
+#include <stdio.h>
+
+FILE*feFopen(const char *path, const char *mode, char *where=0, short useWerror=0, short path_only=0);
+
 /*
 // These are our versions of fopen and fread They are very similar to
@@ -19 +21 @@
 // do never use fopen and fread
 */
-
 FILE *myfopen(const char *path, const char *mode);
-
 size_t myfread(void *ptr, size_t size, size_t nmemb, FILE *stream);