Changeset 57aada in git

Timestamp:

Oct 1, 2014, 2:57:59 PM (9 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

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

Children:

75ef2974c275b76431a0aaf72d5136dad3c63b63

Parents:

351717f210df19b5dd8d203ad7fc30592d9516c6

Message:

windows port: more __CYGWIN__

Files:

• Singular/LIB/help.cnf (modified) (1 diff)
• Singular/sing_win.cc (modified) (2 diffs)
• Singular/sing_win.h (modified) (2 diffs)
• kernel/oswrapper/feread.cc (modified) (1 diff)
• kernel/oswrapper/fereadl.c (modified) (1 diff)
• kernel/spectrum/semic.cc (modified) (1 diff)
• resources/feFopen.cc (modified) (2 diffs)
• resources/feResource.cc (modified) (6 diffs)
• resources/feResource.h (modified) (1 diff)

Singular/LIB/help.cnf

@@ -25 +25 @@
 # the default help browsers builtin, dummy and emacs are always 
 #   available and should NOT be mentioned here
-# ix86_Win: has additional default browsers: htmlhelp, html and winhlp
+# __CYGWIN__: has additional default browsers: htmlhelp, html and winhlp
 #   also not mentioned here
 #----------------------------------------------------

Singular/sing_win.cc

@@ -11 +11 @@
 
 #include <kernel/mod2.h>
-#ifdef ix86_Win
+#ifdef __CYGWIN__
 #include <windows.h>
 #include <winuser.h>
@@ -110 +110 @@
 }
 
-#endif /*ix86_Win */
+#endif /*__CYGWIN__ */

Singular/sing_win.h

@@ -2 +2 @@
 #define SING_WIN_H
 
-#ifdef ix86_Win
+#ifdef __CYGWIN__
 
 void heOpenWinHtmlHelp(const char* keyw, char* helppath );
@@ -8 +8 @@
 void heOpenWinntUrl(const char* url, int local);
 
-#endif /*ix86_Win */
+#endif /*__CYGWIN__ */
 #endif /* SING_WIN_H */

kernel/oswrapper/feread.cc

@@ -14 +14 @@
 
 //----------------------------------------
-#ifdef ix86_Win
+#ifdef __CYGWIN__
 #define READLINE_STATIC
 #endif

kernel/oswrapper/fereadl.c

@@ -190 +190 @@
     else
     {
-      #ifndef ix86_Win
+      #ifndef __CYGWIN__
       extern char *BC;
       extern char *UP;

kernel/spectrum/semic.cc

@@ -24 +24 @@
 
 #include <string.h>
-
-#ifndef ix86_Win
-//#include<values.h>
-#endif
 
 #include <misc/intvec.h>

resources/feFopen.cc

@@ -53 +53 @@
     {
       const char* home = getenv("HOME");
-#ifdef ix86_Win
+#ifdef __CUGWIN__
       if ((home==NULL)||(!access(home,X_OK)))
         home = getenv("SINGHOME");
@@ -166 +166 @@
 FILE* myfopen(const char *path, const char *mode)
 {
-#if (defined(CYGWIN) || defined(ix86_Win))
+#if (defined(__CUGWIN__))
   char mmode[4];
   int i;

resources/feResource.cc

@@ -87 +87 @@
   {"IdxFile",   'x',    feResFile,  "SINGULAR_IDX_FILE",    "%D/doc/singular.idx",  (char *)""},
   {"HtmlDir",   'h',    feResDir,   "SINGULAR_HTML_DIR",    "%D/singular/html",              (char *)""},
-#ifdef ix86_Win
+#ifdef __CYGWIN__
   {"HtmlHelpFile",'C',  feResFile,  "SINGULAR_CHM_FILE",    "%r/doc/Manual.chm",    (char *)""},
 #endif
@@ -100 +100 @@
   {"EmacsDir",  'e',    feResDir,   "ESINGULAR_EMACS_DIR",  "%D/singular/emacs",             (char *)""},
   {"SingularXterm",'M', feResBinary,"TSINGULAR_SINGULAR",   "%b/Singular",          (char *)""},
-#ifdef ix86_Win
+#ifdef __CYGWIN__
   {"rxvt",      'X',    feResBinary,"RXVT",                 "%b/rxvt",              (char *)""},
 #else
@@ -130 +130 @@
 static void mystrcpy(char* d, char* s);
 static char* feSprintf(char* s, const char* fmt, int warn = -1);
-#if defined(ix86_Win) && defined(__GNUC__)
+#if defined(__CYGWIN__) && defined(__GNUC__)
 // utility function of Cygwin32:
 extern "C" int cygwin32_posix_path_list_p (const char *path);
@@ -167 +167 @@
 void feInitResources(const char* argv0)
 {
-#if defined(ix86_Win) && defined(__GNUC__)
+#if defined(__CYGWIN__) && defined(__GNUC__)
   if (cygwin32_posix_path_list_p (getenv("PATH")))
     fePathSep = ':';
@@ -407 +407 @@
     return NULL;
   }
-#ifdef ix86_Win // stupid WINNT sometimes gives you argv[0] within ""
+#ifdef __CYGWIN__ // stupid WINNT sometimes gives you argv[0] within ""
   if (*feArgv0 == '"')
   {
@@ -471 +471 @@
       printf("Clean value:%s\n", value);
 #endif
-#ifdef ix86_Win
+#ifdef __CYGWIN__
 #ifdef RESOURCE_DEBUG
       printf("Clean WINNT value:%s\n", value);

resources/feResource.h

@@ -57 +57 @@
 const char fePathSep =
 /* not really cygwin, applies to all windows systems:*/
-#if (defined(CYGWIN) || defined(ix86_Win))
+#if (defined(__CYGWIN__))
                 ';'
 #else