Changeset 5df856 in git

Timestamp:

Aug 26, 2010, 1:21:16 PM (13 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '0604212ebb110535022efecad887940825b97c3f')

Children:

0d5a99d428d867cee2cabcb31fd154c965b46a8f

Parents:

17d2dd978485eec9aa33080578dbbcd68568f8b9

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2010-08-26 13:21:16+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 11:55:26+01:00

Message:

Removing duplicates

Location:

resource

Files:

• config.h.in (modified) (1 diff)
• feFopen.cc (modified) (1 diff)
• feFopen.h (modified) (1 diff)
• feResource.cc (modified) (2 diffs)
• feResource.h (modified) (1 diff)

resource/config.h.in

@@ -11 +11 @@
 #define memcpy4 memcpy
 
+/* define MAXPATHLEN */
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
 #endif
+#ifndef MAXPATHLEN
+#define MAXPATHLEN 1024
+#endif
+
+#define  DIR_SEP '/'
+#define  DIR_SEPP "/"
+
+
+#endif

resource/feFopen.cc

@@ -6 +6 @@
 #include <unistd.h>
 
+#include "config.h"
+
 #include <auxiliary.h>
 
 #include <omalloc.h>
 #include <reporter.h>
+
 #include "feFopen.h"
 #include "feResource.h"
 
-/* define MAXPATHLEN */
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifndef MAXPATHLEN
-#define MAXPATHLEN 1024
-#endif
-
-
-#define  DIR_SEP '/'
-#define  DIR_SEPP "/"
-
-char fePathSep =
-/* not reallay cygwin, applies to all windows systems:*/
-#if defined(CYGWIN)
-';'
-#else
-':'
-#endif
-;
 
 

resource/feFopen.h

@@ -17 +17 @@
 // do never use fopen and fread
 */
-#ifdef ix86_Win
+#if (defined(CYGWIN) || defined(ix86_Win))
+
 FILE *myfopen(const char *path, const char *mode);
+
 #else
+
 #define myfopen fopen
+
 #endif
 
 size_t myfread(void *ptr, size_t size, size_t nmemb, FILE *stream);
+
 #endif

resource/feResource.cc

@@ -11 +11 @@
 #include <string.h>
 
+#include "config.h"
+
 #include <auxiliary.h>
 
-#include "config.h"
 #include "feResource.h"
 
-/* define MAXPATHLEN */
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifndef MAXPATHLEN
-#define MAXPATHLEN 1024
-#endif
-
-#define  DIR_SEP '/'
-#define  DIR_SEPP "/"
 
 
@@ -135 +126 @@
 char* feArgv0=NULL;
 #define MAXRESOURCELEN 5*MAXPATHLEN
-
-char fePathSep =
-#if defined(ix86_Win)
-';'
-#else
-':'
-#endif
-;
 
 static feResourceConfig feGetResourceConfig(const char id);

resource/feResource.h

@@ -20 +20 @@
 // Prints resources into string with StringAppend, etc
 void feStringAppendResources(int warn = -1);
+
+
+
+const char fePathSep =
+// not really cygwin, applies to all windows systems:
+#if (defined(CYGWIN) || defined(ix86_Win))
+                ';'
+#else
+                ':'
 #endif
+                ;
+
+
+
+#endif