Changeset - 959846374f42
[Not reviewed]
Merge
0 4 0
Vitaly Takmazov - 14 years ago 2011-10-21 08:43:15
vitalyster@gmail.com
merge upstream
2 files changed with 3 insertions and 3 deletions:
0 comments (0 inline, 0 general)
backends/CMakeLists.txt
Show inline comments
 
@@ -4,9 +4,11 @@ if (PROTOBUF_FOUND)
 
	endif()
 

	
 
	if (IRC_FOUND)
 
		ADD_SUBDIRECTORY(libircclient-qt)
 
	endif()
 

	
 
if (NOT WIN32)
 
	ADD_SUBDIRECTORY(frotz)
 
endif()
 

	
 
endif()
backends/frotz/dfrotz/dumb/dumb_input.c
Show inline comments
 
@@ -80,15 +80,13 @@ static int xgetchar(void)
 
 * overruns (but that's kind of pointless because there are several
 
 * other places where I'm not so careful).  */
 
static void getline_(char *s)
 
{
 
  int c;
 
  char *p;
 
	
 
  fflush(stdout);
 
  
 
  fflush(stdout); 
 
  p = s;
 
  while (p < s + INPUT_BUFFER_SIZE - 1)
 
    if ((*p++ = xgetchar()) == '\n') {
 
      *p = '\0';
 
      return;
 
    }
0 comments (0 inline, 0 general)