~vcs-imports/eglibc/trunk

« back to all changes in this revision

Viewing changes to libc/resolv/res_send.c

  • Committer: joseph
  • Date: 2013-09-05 22:41:05 UTC
  • Revision ID: svn-v4:7b3dc134-2b1b-0410-93df-9e9f96275f8d:trunk:23928
Merge changes between r23795 and r23927 from /fsf/trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
875
875
                }
876
876
        }
877
877
        /*
878
 
         * If the calling applicating has bailed out of
 
878
         * If the calling application has bailed out of
879
879
         * a previous call and failed to arrange to have
880
880
         * the circuit closed or the server has got
881
881
         * itself confused, then drop the packet and
1229
1229
                    /* Yes, we test ANSCP here.  If we have two buffers
1230
1230
                       both will be allocatable.  */
1231
1231
                    && anscp
 
1232
#ifdef FIONREAD
1232
1233
                    && (ioctl (pfd[0].fd, FIONREAD, thisresplenp) < 0
1233
 
                        || *thisanssizp < *thisresplenp)) {
 
1234
                        || *thisanssizp < *thisresplenp)
 
1235
#endif
 
1236
                    ) {
1234
1237
                        u_char *newp = malloc (MAXPACKET);
1235
1238
                        if (newp != NULL) {
1236
1239
                                *anssizp = MAXPACKET;