fix merge both that broke --without-ssh1 compile

ssh-agent.c

@@ -536,7 +536,6 @@ reaper(void)
 		return (deadline - now);
 }
 
-#ifdef WITH_SSH1
 /*
  * XXX this and the corresponding serialisation function probably belongs
  * in key.c
@@ -579,7 +578,7 @@ agent_decode_rsa1(struct sshbuf *m, struct sshkey **kp)
 		sshkey_free(k);
 	return r;
 }
-#endif
+#endif /* WITH_SSH1 */
 
 static void
 process_add_identity(SocketEntry *e, int version)
@@ -656,7 +655,6 @@ process_add_identity(SocketEntry *e, int version)
 send:
 	send_status(e, success);
 }
-#endif /* WITH_SSH1 */
 
 /* XXX todo: encrypt sensitive data with passphrase */
 static void