From: Ivan Maidanski <ivmai@mail.ru>
Date: Tue, 13 Sep 2011 08:12:53 +0000 (+0400)
Subject: Fix cord/de.c for Cygwin.
X-Git-Tag: gc7_2~136^2~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=57930e5f0b52bc42e6935448806977ec24f1239f;p=gc

Fix cord/de.c for Cygwin.

* cord/de.c (WIN32): Define also for Cygwin.
---

diff --git a/cord/de.c b/cord/de.c
index 989e19a8..f47a1f8e 100644
--- a/cord/de.c
+++ b/cord/de.c
@@ -38,7 +38,7 @@
 #include <ctype.h>
 #endif
 
-#if defined(__BORLANDC__) && !defined(WIN32)
+#if (defined(__BORLANDC__) || defined(__CYGWIN__)) && !defined(WIN32)
     /* If this is DOS or win16, we'll fail anyway.	*/
     /* Might as well assume win32.			*/
 #   define WIN32
@@ -104,7 +104,7 @@ int need_redisplay = 0;	/* Line that needs to be redisplayed.	*/
 
 
 /* Current cursor position. Always within file. */
-int line = 0; 
+int line = 0;
 int col = 0;
 size_t file_pos = 0;	/* Character position corresponding to cursor.	*/
 
@@ -123,7 +123,7 @@ void prune_map()
 {
     line_map map = current_map;
     int start_line = map -> line;
-    
+
     current_map_size = 0;
     for(; map != 0; map = map -> previous) {
     	current_map_size++;
@@ -136,7 +136,7 @@ void prune_map()
 void add_map(int line, size_t pos)
 {
     line_map new_map = GC_NEW(struct LineMapRep);
-    
+
     if (current_map_size >= MAX_MAP_SIZE) prune_map();
     new_map -> line = line;
     new_map -> pos = pos;
@@ -158,7 +158,7 @@ size_t line_pos(int i, int *c)
     size_t cur;
     size_t next;
     line_map map = current_map;
-    
+
     while (map -> line > i) map = map -> previous;
     if (map -> line < i - 2) /* rebuild */ invalidate_map(i);
     for (j = map -> line, cur = map -> pos; j < i;) {
@@ -181,7 +181,7 @@ size_t line_pos(int i, int *c)
 void add_hist(CORD s)
 {
     history new_file = GC_NEW(struct HistoryRep);
-    
+
     new_file -> file_contents = current = s;
     current_len = CORD_len(s);
     new_file -> previous = now;
@@ -210,7 +210,7 @@ void replace_line(int i, CORD s)
     register int c;
     CORD_pos p;
     size_t len = CORD_len(s);
-    
+
     if (screen == 0 || LINES > screen_size) {
         screen_size = LINES;
     	screen = (CORD *)GC_MALLOC(screen_size * sizeof(CORD));
@@ -247,7 +247,7 @@ CORD retrieve_line(CORD s, size_t pos, unsigned column)
     			/* avoids scanning very long lines	*/
     int eol = CORD_chr(candidate, 0, '\n');
     int len;
-    
+
     if (eol == CORD_NOT_FOUND) eol = CORD_len(candidate);
     len = (int)eol - (int)column;
     if (len < 0) len = 0;
@@ -260,7 +260,7 @@ CORD retrieve_line(CORD s, size_t pos, unsigned column)
     CORD retrieve_screen_line(int i)
     {
     	register size_t pos;
-    	
+
     	invalidate_map(dis_line + LINES);	/* Prune search */
     	pos = line_pos(dis_line + i, 0);
     	if (pos == CORD_NOT_FOUND) return(CORD_EMPTY);
@@ -272,12 +272,12 @@ CORD retrieve_line(CORD s, size_t pos, unsigned column)
 void redisplay(void)
 {
     register int i;
-    
+
     invalidate_map(dis_line + LINES);	/* Prune search */
     for (i = 0; i < LINES; i++) {
         if (need_redisplay == ALL || need_redisplay == i) {
             register size_t pos = line_pos(dis_line + i, 0);
-            
+
             if (pos == CORD_NOT_FOUND) break;
             replace_line(i, retrieve_line(current, pos, dis_col));
             if (need_redisplay == i) goto done;
@@ -297,7 +297,7 @@ void normalize_display()
 {
     int old_line = dis_line;
     int old_col = dis_col;
-    
+
     dis_granularity = 1;
     if (LINES > 15 && COLS > 15) dis_granularity = 2;
     while (dis_line > line) dis_line -= dis_granularity;
@@ -334,7 +334,7 @@ void fix_cursor(void)
 void fix_pos()
 {
     int my_col = col;
-    
+
     if ((size_t)line > current_len) line = current_len;
     file_pos = line_pos(line, &my_col);
     if (file_pos == CORD_NOT_FOUND) {
@@ -349,7 +349,7 @@ void fix_pos()
 }
 
 #if defined(WIN32)
-#  define beep() Beep(1000 /* Hz */, 300 /* msecs */) 
+#  define beep() Beep(1000 /* Hz */, 300 /* msecs */)
 #elif defined(MACINTOSH)
 #	define beep() SysBeep(1)
 #else
@@ -399,11 +399,11 @@ void do_command(int c)
     int i;
     int need_fix_pos;
     FILE * out;
-    
+
     if ( c == '\r') c = '\n';
     if (locate_mode) {
         size_t new_pos;
-          
+
         if (c == LOCATE) {
               locate_mode = 0;
               locate_string = CORD_EMPTY;
@@ -514,7 +514,7 @@ void do_command(int c)
      	    {
      	        CORD left_part = CORD_substr(current, 0, file_pos);
      	        CORD right_part = CORD_substr(current, file_pos, current_len);
-     	        
+
      	        add_hist(CORD_cat(CORD_cat_char(left_part, (char)c),
      	        		  right_part));
      	        invalidate_map(line);
@@ -540,7 +540,7 @@ void generic_init(void)
 {
     FILE * f;
     CORD initial;
-    
+
     if ((f = fopen(arg_file_name, "rb")) == NULL) {
      	initial = "\n";
     } else {
@@ -572,7 +572,7 @@ char ** argv;
 	argc = ccommand(&argv);
 #endif
     GC_INIT();
-    
+
     if (argc != 2) goto usage;
     arg_file_name = argv[1];
     setvbuf(stdout, GC_MALLOC_ATOMIC(8192), _IOFBF, 8192);