To make sure, suggest you take the barrel assembly out and just measure it. That way there is no guessing. It is not even that hard taking it apart.
Here is the g36c version I used for Prometheus 6.03 barrel upgrade. Taking the barrel assembly out in less than a few minutes.
http://www.urizenproject.net/airsoft/g36cbarrel/