~john-koepi/ubuntu/trusty/golang/default

« back to all changes in this revision

Viewing changes to src/pkg/netchan/common.go

  • Committer: Bazaar Package Importer
  • Author(s): Ondřej Surý
  • Date: 2011-08-03 17:04:59 UTC
  • mfrom: (14.1.2 sid)
  • Revision ID: james.westby@ubuntu.com-20110803170459-wzd99m3567y80ila
Tags: 1:59-1
* Imported Upstream version 59
* Refresh patches to a new release
* Fix FTBFS on ARM (Closes: #634270)
* Update version.bash to work with Debian packaging and not hg
  repository

Show diffs side-by-side

added added

removed removed

Lines of Context:
153
153
                        break
154
154
                }
155
155
                if timeout > 0 && time.Nanoseconds()-startTime >= timeout {
156
 
                        return os.ErrorString("timeout")
 
156
                        return os.NewError("timeout")
157
157
                }
158
158
                time.Sleep(100 * 1e6) // 100 milliseconds
159
159
        }
186
186
                        break
187
187
                }
188
188
                if timeout > 0 && time.Nanoseconds()-startTime >= timeout {
189
 
                        return os.ErrorString("timeout")
 
189
                        return os.NewError("timeout")
190
190
                }
191
191
                time.Sleep(100 * 1e6) // 100 milliseconds
192
192
        }